Merge branch 'master' into slapos
authorŁukasz Nowak <luke@nexedi.com>
Wed, 6 Jul 2011 08:52:36 +0000 (10:52 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Wed, 6 Jul 2011 08:52:36 +0000 (10:52 +0200)
commitac4230f581e26d11031126c2fd5955ba32f4dadd
tree53e8cb218b06189ce440b78bf2b7e2102f0a3d2e
parentcac4d4a87643b0f5f9a8bda67505e374d072dfdd
parent5b18969ffe4b2742683ad71dc875df0dc128953f
Merge branch 'master' into slapos