Merge branch 'slaprunner'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 13 Feb 2012 12:37:38 +0000 (13:37 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 13 Feb 2012 12:37:38 +0000 (13:37 +0100)
commitba65e350acb20db3661d7802a691b28f13e6a9b9
tree73699592a0d42f0d1daa8c5c93fe3d108214be3c
parent611f80e01bfd8556f96fac86846f01eb9cf71259
parent3f5689d14eff4ac3a94916f84bd060ecec26df11
Merge branch 'slaprunner'

Conflicts:
software/slaprunner/software.cfg