Merge branch 'master' into 6859-fix-invalid-manifests
authorradhika <radhika@curoverse.com>
Mon, 17 Aug 2015 14:59:34 +0000 (10:59 -0400)
committerradhika <radhika@curoverse.com>
Mon, 17 Aug 2015 14:59:34 +0000 (10:59 -0400)
commita25971cae157b6bc40037e391db226da36dc9b30
treea1993522d43b8def7bf40fcde0d5cba7a7629123
parent446868283108deda5510f4419b4065d254a4c5a8
parent73aca60f271fb8217204e7659e45889b4678f33c
Merge branch 'master' into 6859-fix-invalid-manifests