Merge branch 'master' into slaprunner
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 6 Jun 2012 16:04:10 +0000 (18:04 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 6 Jun 2012 16:04:10 +0000 (18:04 +0200)
commitefbf173c5e8083bf4f9636ee64d3e6636de48659
tree8e9d7f1032e89b7a9697eff307e0a2ad8675c6cd
parent458d32efdbc92ee5754bd14483cbdb045aece2ce
parent7862e18aca2e4dc41f723659e4d405df61ce259f
Merge branch 'master' into slaprunner
software/slaprunner/software.cfg
stack/lamp/buildout.cfg