Merge branch '5425-set-docker-memory-limits' refs #5425
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 23 Mar 2015 17:47:17 +0000 (13:47 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 23 Mar 2015 17:47:17 +0000 (13:47 -0400)

Trivial merge