Merge remote-tracking branch 'beak/next' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 9 Jul 2013 20:15:44 +0000 (22:15 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 9 Jul 2013 20:15:44 +0000 (22:15 +0200)

Trivial merge