Merge branch 'mysql'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 24 Jun 2011 11:20:18 +0000 (13:20 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 24 Jun 2011 11:20:18 +0000 (13:20 +0200)
commit8eb6bf2d7c8f828da4c1e941b1e336bbbb9506d8
treedd5cc60608fe5f5e8eaf6665c38bbe26b06a5706
parent10e3ae2a43610d49a49ed0d8dfe463668c15347a
parentc0dd454147cb0d4aaf73de064e60c1d902156956
Merge branch 'mysql'