Merge branch 'mysql' slapos-0.48
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 21 Sep 2011 08:56:21 +0000 (10:56 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 21 Sep 2011 08:56:21 +0000 (10:56 +0200)
commitb92834f0313c0eae66c4ad003994e3a598aae62c
tree186084f1320a53d9a4760627d63af1d48307a787
parent96dc58a13c8c53e7db670152a3366fcf18115a8b
parent4c22dc67fb91173c3b4e415ec643999be20b95af
Merge branch 'mysql'