Merge branch 'image-management' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 26 Sep 2011 19:31:55 +0000 (21:31 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 26 Sep 2011 19:31:55 +0000 (21:31 +0200)
commit4f92a116596bf5d42c5b8beadb5df2bc8149e809
tree7c40e0a50422da0565330b55c556c3d93c9f5d86
parent3b25d775c6066d65a5ab45844546552badd3d80d
parentbf0de925ce6daac5a86df3fd7c34d86843257655
Merge branch 'image-management' into next