Merge branch 'master' into slapos
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 14 Sep 2012 11:52:19 +0000 (13:52 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 14 Sep 2012 11:52:19 +0000 (13:52 +0200)
commit5a4238b7f93fe2614d480d79fc6009e2a0d8ef69
treee1618d6a1b35fff6e4f0d24d575e09d3a75b4a9e
parent836bb2ebf7a3636fa32a28d335e390d97f76bf31
parented0005ca444090e1deb239f14ef038f5f68cc534
Merge branch 'master' into slapos

Conflicts:
component/slapos/buildout.cfg
component/slapos/buildout.cfg