Merge branch 'slaprunner_newcloud9' into slaprunner
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 19 Sep 2012 15:20:02 +0000 (17:20 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 19 Sep 2012 15:20:02 +0000 (17:20 +0200)
commit6f92c0924d63b1ea7f6d1807205ee036adcc6952
tree56f513894b58c67c1de319e0475adad4251f5c55
parent5a6a7df4b2b9d8749569911c1879b24998fb12fa
parentfe0941da7da98aaf91a779542b943068170d7c02
Merge branch 'slaprunner_newcloud9' into slaprunner

Conflicts:
software/slaprunner/software.cfg
software/slaprunner/software.cfg