Merge branch 'release-0.7' 0.7
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 26 Sep 2011 20:17:49 +0000 (22:17 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 26 Sep 2011 20:17:49 +0000 (22:17 +0200)
commit38cb6c5ec82298ee351d0eb15ddd8331db273af2
tree4c7f6a15fb4aa04c802d81d40b9de289152940e1
parentf399a0d5d29599c318a0f14f109a26a6667c1230
parentb6121e760977e85b6ae45f2b6cfaaa247be98322
Merge branch 'release-0.7'