Merge branch 'master' into xwiki
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 24 Aug 2011 13:33:39 +0000 (15:33 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 24 Aug 2011 13:33:39 +0000 (15:33 +0200)
commit9ecdd48a97040336078f3f60369d2a56481314df
treecad8055fb979f2336df872ad40dc57326f3d0558
parent882a0e819ee4fe6e5cbaec77b5de47cf52098681
parent5718ea2a98f37dcc8fbe973f093ded3d1979311f
Merge branch 'master' into xwiki