Merge branch 'mysql' slapos-0.47
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 20 Sep 2011 16:17:52 +0000 (18:17 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 20 Sep 2011 16:17:52 +0000 (18:17 +0200)
commit96dc58a13c8c53e7db670152a3366fcf18115a8b
treed7bbf690dcc9f3659c26ca9a12c5a4734db1fefa
parentde7cb0903da0d46ac9479532b300021b60a61803
parent589f55b3dc9b6871a4b016b47cf139192fdbca34
Merge branch 'mysql'