3960: Merge branch 'master' into 3960-show-more-repos
authorTom Clegg <tom@curoverse.com>
Wed, 24 Sep 2014 19:49:02 +0000 (15:49 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 24 Sep 2014 19:49:02 +0000 (15:49 -0400)

Trivial merge