Merge branch 'slaprunner-no-cloud9' slapos-0.204
authorNicolas Wavrant <nicolas.wavrant@tiolive.com>
Thu, 9 Jan 2014 15:47:23 +0000 (16:47 +0100)
committerNicolas Wavrant <nicolas.wavrant@tiolive.com>
Thu, 9 Jan 2014 15:47:23 +0000 (16:47 +0100)
commitb3400dcc7d45d183131aa616e596eef279ad6d48
tree56a56cf99e77cae1347947adcc6189a544c52afb
parentc1eb6196311e329fb0cb0174a3317a5af6255e5d
parentfc71a1489a38049cd949f4c046fd64b04e8c0c3f
Merge branch 'slaprunner-no-cloud9'