Merge branch 'master' into lamp
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 13 Jan 2012 13:27:50 +0000 (14:27 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 13 Jan 2012 13:27:50 +0000 (14:27 +0100)
commitbadb698fa6e05c2ee06d54ab001959b616c99fa7
treeb6e7f226fd60b3caea786f96543ec633fbae4f77
parent5eb8b8eb3eea6984eaa2eabb5e581e0eb50d8d3f
parent0cb0e7602d82d02733ffcec26b502fa3f0760c70
Merge branch 'master' into lamp

Conflicts:
component/mariadb/buildout.cfg
component/mariadb/buildout.cfg