Merge remote branch 'remotes/ziplib-loc/master'
authorKonrad Rosenbaum <konrad@silmor.de>
Tue, 6 Dec 2011 06:53:33 +0000 (07:53 +0100)
committerKonrad Rosenbaum <konrad@silmor.de>
Tue, 6 Dec 2011 06:53:33 +0000 (07:53 +0100)
commit5492a77970da1ba3c1a499449d2bd9d0b52aea1e
treeb2e32a685e307ce3a15d71be5f832c434ca3f373
parenta54a9e38a0f5b49745812974a9a6c2e63d74ce1e
parent14e89556bd935cd5d247953cc20aff79c2632f04
Merge remote branch 'remotes/ziplib-loc/master'