Merge branch 'master' into 6093-refresh-docs
authorradhika <radhika@curoverse.com>
Wed, 27 May 2015 19:38:59 +0000 (15:38 -0400)
committerradhika <radhika@curoverse.com>
Wed, 27 May 2015 19:38:59 +0000 (15:38 -0400)
commitfa9fc5ab6440415542badc8bee0b144d698ec5cc
tree026f23376840e1ddf3820e04cb7e70a8f8c5e898
parent53b19718f974e7c9014644ce80fa36363ae0b693
parent32038d56fbfe5b635b1c53f247aea9abcca2285c
Merge branch 'master' into 6093-refresh-docs

Conflicts:
doc/user/tutorials/tutorial-submit-job.html.textile.liquid
doc/index.html.liquid
doc/user/reference/api-tokens.html.textile.liquid
doc/user/tutorials/tutorial-firstscript.html.textile.liquid
doc/user/tutorials/tutorial-submit-job.html.textile.liquid