Merge branch 'master' into lamp-mayoro
authorMayoro Diagne <mayoro@nexedi.com>
Sat, 24 Mar 2012 16:34:04 +0000 (17:34 +0100)
committerMayoro Diagne <mayoro@nexedi.com>
Sat, 24 Mar 2012 16:34:04 +0000 (17:34 +0100)
commit22afe2690a83cd918c431cdd271ad29c2e73b070
tree231b1d32b3bce8de0bd0ae60a257e0167c3a5ae5
parent0d269c6c690af9261bfc8a35ae94675b37f8ade2
parentb61d2b32688da9e050768f4991285b1532e974cd
Merge branch 'master' into lamp-mayoro