From: radhika <radhika@curoverse.com>
Date: Tue, 18 Nov 2014 18:53:15 +0000 (-0500)
Subject: Merge branch 'master' into 4194-keep-logging
X-Git-Tag: 1.1.0~1985^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/b1f3c944c3217b6e42a377f4b0a04985c9cea908

Merge branch 'master' into 4194-keep-logging
---

b1f3c944c3217b6e42a377f4b0a04985c9cea908