Merge branch 'image-navigation' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 14 Nov 2011 20:24:21 +0000 (21:24 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 14 Nov 2011 20:24:24 +0000 (21:24 +0100)
This resolves #233.


Trivial merge