Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 13 Oct 2012 08:18:23 +0000 (10:18 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 13 Oct 2012 08:18:23 +0000 (10:18 +0200)

Trivial merge