Merge branch 'master' into 7167-keep-rsync-test-setup
authorradhika <radhika@curoverse.com>
Wed, 7 Oct 2015 20:50:04 +0000 (16:50 -0400)
committerradhika <radhika@curoverse.com>
Wed, 7 Oct 2015 20:50:04 +0000 (16:50 -0400)
commit0bae20041e6dd78b086ba1354b8de9aee4e6baed
treed3a8eec89af9107d95af1ee4030a2a43ecb05aef
parent96dab84d9f1cd7d590f2c119ed6e484c8ed4888c
parent7c97dd88e541a0245272b8e93a33e4d2fe4e32cd
Merge branch 'master' into 7167-keep-rsync-test-setup