Merge branch 'master' into 6859-fix-invalid-manifests
authorradhika <radhika@curoverse.com>
Tue, 25 Aug 2015 16:42:40 +0000 (12:42 -0400)
committerradhika <radhika@curoverse.com>
Tue, 25 Aug 2015 16:42:40 +0000 (12:42 -0400)
commite513251f7b0f6acdc0c0d6df5792c18358030221
treebcaa2f8168f985693d2bdc1adc25ad0be9cd8412
parent647c3bac741b56ce16c7e22ab2d462725a34198d
parentb5a7183d43ca4607fdc259267087e7f795d14de2
Merge branch 'master' into 6859-fix-invalid-manifests