Merge branch 'xwiki' slapos-0.39
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Sat, 27 Aug 2011 00:26:05 +0000 (02:26 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Sat, 27 Aug 2011 00:26:05 +0000 (02:26 +0200)
commit3092f8fa808bae947cd527ad6be6312c26b5550d
tree19b54bd62c5e1e340c5dc30ec70e698de4ae3796
parent4c1db4d5ce1795b57dbc129c54798265ab44ac5e
parentfef5e8f750fe5937bc6ab187a97ec5efbc5abf7c
Merge branch 'xwiki'