Merge remote-tracking branch 'github/master'
authorJo Shields <directhex@apebox.org>
Tue, 24 Jul 2012 14:46:15 +0000 (15:46 +0100)
committerJo Shields <directhex@apebox.org>
Tue, 24 Jul 2012 14:46:15 +0000 (15:46 +0100)
Conflicts:
external/debian-snapshot


Trivial merge