Merge branch 'slaprunner-paas' slapos-0.236
authorNicolas Wavrant <nicolas.wavrant@tiolive.com>
Tue, 12 Aug 2014 06:18:30 +0000 (07:18 +0100)
committerNicolas Wavrant <nicolas.wavrant@tiolive.com>
Tue, 12 Aug 2014 06:18:30 +0000 (07:18 +0100)
commitedfb66ca1f7cf3e564eae12e865893397aa0ac19
treeededbf4f4204e4283f79d94a99d4c020cff31226
parenta19c90c0a440cf268def4c7a33e3f4b28410099e
parent284eec5add8e746d6ccee6a1732874712139cde8
Merge branch 'slaprunner-paas'

Conflicts:
component/apache/buildout.cfg
stack/monitor/buildout.cfg