Merge branch 'slaprunner' slapos-0.138
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 9 Nov 2012 18:09:06 +0000 (19:09 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 9 Nov 2012 18:09:06 +0000 (19:09 +0100)
commitc1f72c3124316f2c6eb800d2190e338d09272cb1
tree06e507ae2be08bf41b14460e6a6097263b72fef1
parent4bc6ef6753d7db2f1e498d10fa47629105d85442
parent06c730abdc5c598898bc11cb53cac72f88152f67
Merge branch 'slaprunner'

Conflicts:
component/slapos/buildout.cfg