Merge branch 'master' into 2221-complete-docker
authorTim Pierce <twp@curoverse.com>
Wed, 12 Mar 2014 18:43:38 +0000 (14:43 -0400)
committerTim Pierce <twp@curoverse.com>
Wed, 12 Mar 2014 18:43:38 +0000 (14:43 -0400)
commit189fee6586b290a78cdc1b3a3b9845efe0cf7499
tree411f44539d51b14814da5b863d4614caa2ec9b1a
parent041a71c199e15f89b5adf4a5b5058b5ccbb171ee
parent850bcd4de3903186ace4fe00a67d6c0910c959c2
Merge branch 'master' into 2221-complete-docker

Conflicts:
doc/user/topics/tutorial-job-debug.html.textile.liquid
doc/user/tutorials/tutorial-keep.html.textile.liquid
doc/install/client.html.textile.liquid
doc/user/topics/tutorial-job-debug.html.textile.liquid