Merge branch master
authorJulien Muchembled <jm@nexedi.com>
Thu, 13 Sep 2012 09:25:33 +0000 (11:25 +0200)
committerJulien Muchembled <jm@nexedi.com>
Thu, 13 Sep 2012 09:25:33 +0000 (11:25 +0200)
commit30cbfe33e698f79900fee90b2309d5dc55e0af13
tree7d27d5c3301c6adbb48ee9e606669ae187280a18
parent4ac5ca74b0de4117f7dd90fd08fc536343d6fe0f
parentfff8452df90555f9d59deab52f883bb8a4a03876
Merge branch master