Merge branch 'master' into wprtubackup
authorAntoine Catton <acatton@tiolive.com>
Fri, 23 Dec 2011 15:39:01 +0000 (16:39 +0100)
committerAntoine Catton <acatton@tiolive.com>
Fri, 23 Dec 2011 15:39:01 +0000 (16:39 +0100)
commitdba72bf321c595ca2ea14853da021d2f9025a602
tree9eda275ffeac3d5a96d3f79839f4253a10449d1f
parent60f410dc1729c602b704b77eb627600dac3f84f2
parent6ada966b625419758c839aff1970f505be74a837
Merge branch 'master' into wprtubackup

Conflicts:
component/mariadb/buildout.cfg
component/stunnel/buildout.cfg
slapos/recipe/mysql/template/my.cnf.in
setup.py
slapos/recipe/mysql/template/my.cnf.in