Merge branch 'master' into slapos
authorŁukasz Nowak <luke@nexedi.com>
Fri, 2 Sep 2011 09:42:28 +0000 (11:42 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Fri, 2 Sep 2011 09:42:28 +0000 (11:42 +0200)
commitda2381e5f361cc2df2064e558a03d5cfe02a55fa
treeb3897a56ac0c10463f4de8f31a7771f8270a6c29
parent293bd5d3c189028e5f52f5a4a9d35586b226c9d2
parent19ec1b8c9baa4d46dae2b9320d82c7e2e6954bb7
Merge branch 'master' into slapos