Merge branch '1608-api-documentation' of git.clinicalfuture.com:arvados into 1608...
authorTim Pierce <twp@clinicalfuture.com>
Fri, 20 Dec 2013 23:38:34 +0000 (18:38 -0500)
committerTim Pierce <twp@clinicalfuture.com>
Fri, 20 Dec 2013 23:38:34 +0000 (18:38 -0500)

Trivial merge