Merge branch 'slaprunner'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 28 Mar 2012 17:26:00 +0000 (19:26 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 28 Mar 2012 17:26:00 +0000 (19:26 +0200)
commit3109dbcd24b6cdbeca5b679a86e1ac166536d997
tree57f034c2d049b37c87d2affd3ccf0658b872977c
parent55e601bd7ced256191cd4a41d07314b46552da4c
parent90605576f93edb662c10160a6896859e9895f56f
Merge branch 'slaprunner'
component/nodejs/buildout.cfg
software/slaprunner/software.cfg