Merge branch 'osoetraining' slapos-0.16
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 11 Jul 2011 15:37:57 +0000 (17:37 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 11 Jul 2011 15:37:57 +0000 (17:37 +0200)
commitee6caee6215a00b92aa6016d46ff291dbc4d4e2c
treee7fbcc633a1c036a2becaaa039bfa679153f188c
parentdd530a414d012714cefd95b7f08723020f19e93d
parentbe8afb765b2d18399d0647ec81a56a640f5e0df5
Merge branch 'osoetraining'