Merge branch 'lapp-resilient4' slapos-0.150
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 12 Feb 2013 16:22:21 +0000 (17:22 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 12 Feb 2013 16:22:21 +0000 (17:22 +0100)
commit8bc8403278c2701a9276b452ee0ffe43204fda10
tree84b2c0e220a13f9aed03dc306399797ecd3a3c1d
parentf19a0f2f54e62c362300026227bc526ec42b3fbc
parent47ea9c12722a4d8c58dfc94dfc11def9bbd60819
Merge branch 'lapp-resilient4'

Conflicts:
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg