Merge branch '8561-node-pairing' of git.curoverse.com:arvados into 8561-node-pairing
authorradhika <radhika@curoverse.com>
Thu, 17 Mar 2016 15:17:12 +0000 (11:17 -0400)
committerradhika <radhika@curoverse.com>
Thu, 17 Mar 2016 15:17:12 +0000 (11:17 -0400)

Trivial merge