Merge branch 'next' into image-management
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 10 Jan 2011 19:16:25 +0000 (20:16 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 10 Jan 2011 19:16:25 +0000 (20:16 +0100)
commit0157d6ead52bd7c3052b368bed7026075be7cb33
treed77cee46dcd2ba1f005a18e1a4f66e5b890287e4
parenteb33b3c9209b22b1b772060afe6cd0a383bf0e78
parenta474ae28d3820854e9a8d8ea5b9f3a44b06fa737
Merge branch 'next' into image-management
src/main/resources/templates/insert/sone.xml