Runner: Merge development into master for release slapos-0.242
authorCédric Le Ninivin <cedric.leninivin@tiolive.com>
Thu, 25 Sep 2014 13:24:52 +0000 (15:24 +0200)
committerCédric Le Ninivin <cedric.leninivin@tiolive.com>
Thu, 25 Sep 2014 13:24:52 +0000 (15:24 +0200)
commit1ac1878b5d44d1a92cbf4204858eefcfab767d36
tree321a7387b4eb580bf049f18c7319cef5380eadf3
parent4e244f48fa5df42ef796be85d9736da5383e8ee8
parent089a201f106c62353c63e67354e2b01879b4ebf3
Runner: Merge development into master for release

Conflicts:
software/slaprunner/schema.json
software/slaprunner/software.cfg.json