Merge remote branch 'remotes/dptr-loc/master'
authorKonrad Rosenbaum <konrad@silmor.de>
Mon, 5 Dec 2011 20:56:21 +0000 (21:56 +0100)
committerKonrad Rosenbaum <konrad@silmor.de>
Mon, 5 Dec 2011 20:56:21 +0000 (21:56 +0100)

Trivial merge