Merge branch 'xwiki' slapos-0.38
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Sat, 27 Aug 2011 00:04:43 +0000 (02:04 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Sat, 27 Aug 2011 00:04:43 +0000 (02:04 +0200)
commit4c1db4d5ce1795b57dbc129c54798265ab44ac5e
tree137af8704f970160b05bc047e60aef1a85750e50
parenteb234bfa7a8e74e3d89d2780ebfbfd1ab7333a9d
parent602260d0bddee3be42846e064b0b3af4f36323db
Merge branch 'xwiki'