Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 13 Jul 2012 22:44:14 +0000 (00:44 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 13 Jul 2012 22:44:14 +0000 (00:44 +0200)

Trivial merge