Merge branch 'master' into 6859-fix-invalid-manifests
authorradhika <radhika@curoverse.com>
Thu, 13 Aug 2015 12:50:24 +0000 (08:50 -0400)
committerradhika <radhika@curoverse.com>
Thu, 13 Aug 2015 12:50:24 +0000 (08:50 -0400)
commita0daf49f4231d5b4ec6a8a00bfa0aac1ce69cde8
tree9e1f95cac1ac9ed010909eb1704cb48dfd5784ac
parentca35c58c19b28dcdbbff71fe3da0ee16ca760673
parentf96550cc40f340c79339338d1da81394bfcb64ad
Merge branch 'master' into 6859-fix-invalid-manifests