Merge branch 'release-0.8.7' 0.8.7
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 25 Sep 2013 17:28:02 +0000 (19:28 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 25 Sep 2013 17:28:02 +0000 (19:28 +0200)
commit7017646bf42cb265b6df539bb6def40b91d2f968
treec41930b05a4eb318f6d3fd4de4767ba3457cf9a3
parent78da2db8d883349c8509a4f4794b844e2e6c6b31
parented0528d0036fddca62d88f15a564d0005631bedd
Merge branch 'release-0.8.7'