Merge branch 'kumofs'
authorJean-Baptiste Petre <jean-baptiste.petre@nexedi.com>
Fri, 23 Sep 2011 15:54:49 +0000 (17:54 +0200)
committerJean-Baptiste Petre <jean-baptiste.petre@nexedi.com>
Fri, 23 Sep 2011 15:54:49 +0000 (17:54 +0200)
commite024918c068f0817da82b64a78cd0e2f926ce131
treeb409714d31859664cc7fd9457dfc9eef1d073a56
parente422c3141be0a8ca5abef697709befaca64d1ba9
parentf0c9f108a213534a29c5f909ed5ce3b2e5d434d4
Merge branch 'kumofs'