Merge branch 'master' into xwiki
authorJean-Baptiste Petre <jean-baptiste.petre@nexedi.com>
Tue, 20 Sep 2011 10:46:11 +0000 (12:46 +0200)
committerJean-Baptiste Petre <jean-baptiste.petre@nexedi.com>
Tue, 20 Sep 2011 10:46:11 +0000 (12:46 +0200)
commit35b650daa0df74497e9c360d5f5738ba221cb88f
tree0814a4fdb2871133d9fbeccf767fedb9989fe37e
parent3bafc19a220de7dec133d0e6564e1f479b5009d4
parent7cc1f011b9c34334bf3762fe9a0de077050c31bd
Merge branch 'master' into xwiki