Merge branch master into lamp-mayoro
authorMayoro Diagne <mayoro@nexedi.com>
Tue, 3 Apr 2012 17:14:58 +0000 (17:14 +0000)
committerMayoro Diagne <mayoro@nexedi.com>
Tue, 3 Apr 2012 17:14:58 +0000 (17:14 +0000)
commite6ac66f315202b13952c5645d796cfa2d1a1e9f7
tree98223b1dc7f46db231403515044e7befbf46a57c
parent3f76a016c100e7997ac4c6b75d0e190ada708eda
parent1e81747d38a548c0e84cd020b1e49cdded4855a4
Merge branch master into lamp-mayoro