Merge remote-tracking branch 'refs/remotes/origin/master'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 31 Oct 2012 15:14:19 +0000 (16:14 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 31 Oct 2012 15:14:19 +0000 (16:14 +0100)

Trivial merge