Merge branch 'master' into 7490-datamanager-dont-die-return-error
authorradhika <radhika@curoverse.com>
Thu, 12 Nov 2015 21:26:44 +0000 (16:26 -0500)
committerradhika <radhika@curoverse.com>
Thu, 12 Nov 2015 21:26:44 +0000 (16:26 -0500)
commit2255281ed7406e7c10027ed778f53ee28e6869fa
treee7ab604819a183c56483cd5b4dc351b248cf63fd
parentda68b65f0264961902d0a26aea42466a69523148
parent8d9db88641ada8ecd5400fe4affd9b90647c5d3a
Merge branch 'master' into 7490-datamanager-dont-die-return-error