Merge branch 'master' into 4904-arv-web
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 11 Feb 2015 21:01:24 +0000 (16:01 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 11 Feb 2015 21:01:24 +0000 (16:01 -0500)
commit5dbf5c8ea2d9eb2bc8e10a03ca625f12ed71f12c
tree5678490ad267305d073e272619b59d4575a79eba
parentc9ff74363edc2f3271c117184be2d1ad7fad633a
parentb80db28cdd536077e5effe6c08af079532c2059b
Merge branch 'master' into 4904-arv-web

Conflicts:
sdk/python/arvados/events.py
doc/_config.yml
sdk/python/arvados/events.py
services/fuse/arvados_fuse/__init__.py