Merge branch 'xwiki' slapos-0.37
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 26 Aug 2011 23:45:29 +0000 (01:45 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 26 Aug 2011 23:45:29 +0000 (01:45 +0200)
commitf9278dcaa186f1e0aa5c4a67dfb83504cef626da
treed410977b54fa3e8538eb592ce09ffd364ff96d0f
parent8b6c5a56023567895021c9c6c3c66638e80134ad
parent913372d0cfbfe97e4dc43a361d8976c821f17c82
Merge branch 'xwiki'