Merge branch 'master' into slaprunner-paas
authorNicolas Wavrant <nicolas.wavrant@tiolive.com>
Wed, 27 Aug 2014 01:56:40 +0000 (03:56 +0200)
committerNicolas Wavrant <nicolas.wavrant@tiolive.com>
Wed, 27 Aug 2014 01:56:40 +0000 (03:56 +0200)
commitc31e51a0ebc8c52e38b30d08f118dc8a0b72c1bb
treed783bb4154235a6f0fd87f81b0d4ac961d02b386
parentecafb654543147fcfed8ea72138fbb08dc60f923
parentab788ea25c34636ed167e6b690598579512f4158
Merge branch 'master' into slaprunner-paas

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