Merge branch 'master' into 3859-crunch-job-use-lock
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 1 Oct 2014 00:11:13 +0000 (20:11 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 1 Oct 2014 00:11:13 +0000 (20:11 -0400)
commit9f8d2cb25aa52f269f86eee71aee8bb66c8a0214
tree51be03fa8c4583df8f4ea8e620533497d79510e1
parentc5536580df437cfb2d9e96bbd29e254f57c53869
parent84798b73902fdf81f68ec55365e3a356cb8dec95
Merge branch 'master' into 3859-crunch-job-use-lock