Merge remote branch 'remotes/dptr-loc/master'
authorKonrad Rosenbaum <konrad@silmor.de>
Tue, 6 Dec 2011 19:38:00 +0000 (20:38 +0100)
committerKonrad Rosenbaum <konrad@silmor.de>
Tue, 6 Dec 2011 19:38:00 +0000 (20:38 +0100)
commitdfe1342e50c307ef132e9f1a6ab34549da827c09
treef99e3b5b869fef0a143b33075e117215208f0e20
parentc3add6080660bb9c2180ad6cbd211761040e6025
parent948744964683dec959bb3f2a9a18903bf20b8cac
Merge remote branch 'remotes/dptr-loc/master'