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)
commit0dd4e96ad9d081285b1402fe09d4281a29cf3bd1
tree82a115617a698eefe03b13a50ce0413e5c3c6954
parent55f5cae4332e1e5d10ea51bd5c96ba93a9b4c1f9
parent948744964683dec959bb3f2a9a18903bf20b8cac
Merge remote branch 'remotes/dptr-loc/master'