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)
commitac3b11129679548836a3603f0db756986c83e675
tree42ec77dac3e0fca63cd142e88a2fe140d8f85734
parent2a3193f488ecff7496d7464e2e2213c82a2708a3
parent835f3eb22795f974c67aeb19319274489cf5dd1f
Merge branch 'image-navigation' into next

This resolves #233.