Merge branch 'master' into 7490-datamanager-dont-die-return-error
authorradhika <radhika@curoverse.com>
Wed, 11 Nov 2015 17:34:04 +0000 (12:34 -0500)
committerradhika <radhika@curoverse.com>
Wed, 11 Nov 2015 17:34:04 +0000 (12:34 -0500)
commitdfb9a5e285e4275c26b6f959a04babd5a8ad836e
tree4f957cc1603a9ad821fe7b08a88305513fa1bb1f
parent192e5a9d12fb9fd16baff2b61af011611b671983
parent1e2ace543b5614023e30f77d85c19da954cbf1cb
Merge branch 'master' into 7490-datamanager-dont-die-return-error