Merge branch 'master' into 1932-job-output-persistent
authorTom Clegg <tom@curoverse.com>
Tue, 25 Mar 2014 16:20:18 +0000 (12:20 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 25 Mar 2014 16:20:18 +0000 (12:20 -0400)

Trivial merge