merge conflict : freeze versions slapos-0.28
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 15 Jul 2011 15:57:43 +0000 (17:57 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 15 Jul 2011 15:57:43 +0000 (17:57 +0200)
commitcfce5320fec1aa03d47c692e3f75584d3f7d9ac2
tree335123b0baecb4b7e898852eee1a08de831bbc58
parentdcc93a3b49d68df63479ccead8a1891f21bee38b
parent9da907683bb7c43d2a83640663e20853854cdf9b
merge conflict : freeze versions
component/slapos/buildout.cfg