Merge branch 'image-management' into beta-freefall beta-freefall-0.6.2-2
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 13 Apr 2011 13:48:47 +0000 (15:48 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 13 Apr 2011 13:48:47 +0000 (15:48 +0200)
commitd3a73daf123f9042ab38b8587c4a63043c64b92f
tree3302150ae2e8bd1ceaaae443aa1188c7f79ef3d8
parent14d514fac80a24922138a530e376c2d238fe4190
parent2b400308146190305dde0778627cd138fe2a0d0b
Merge branch 'image-management' into beta-freefall