Merge remote-tracking branch 'origin/master'
authorCédric Le Ninivin <cedric.leninivin@tiolive.com>
Mon, 20 Aug 2012 08:09:15 +0000 (10:09 +0200)
committerCédric Le Ninivin <cedric.leninivin@tiolive.com>
Mon, 20 Aug 2012 08:09:15 +0000 (10:09 +0200)
commit794a51c731db23b31c3a4908d8d9a5ed522d3818
tree51731c2af0a4cbb238065ed003f01cb41438dd47
parentdc0dffd59d150a37e57d097cc96399f20c66db12
parent59e686856f75346672140c210c3d67176dc39d60
Merge remote-tracking branch 'origin/master'
component/slapos/buildout.cfg