Merge branch 'master' into cloudooo
authorRafael Monnerat <rafael@nexedi.com>
Mon, 6 Jun 2011 19:37:03 +0000 (16:37 -0300)
committerRafael Monnerat <rafael@nexedi.com>
Mon, 6 Jun 2011 19:37:03 +0000 (16:37 -0300)
commita9e150196f932e85d93a1613b1a31e89586b0f61
tree7a72dd2015eca26e24ca39139415184756aabb6b
parent3edd8fa98422f709b6762a779386977ac180dac3
parentc979d3c0a3bf05f3e71c9a714e79cb68fba87a68
Merge branch 'master' into cloudooo