Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 5 Jul 2013 19:18:11 +0000 (21:18 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 5 Jul 2013 19:18:11 +0000 (21:18 +0200)

Trivial merge