Merge branch '5926-parameterize-max-slots'
authorWard Vandewege <ward@curoverse.com>
Wed, 6 May 2015 20:17:49 +0000 (16:17 -0400)
committerWard Vandewege <ward@curoverse.com>
Wed, 6 May 2015 20:17:49 +0000 (16:17 -0400)
commite7e61999bf577b3ba5308c747dda4a0011516aa7
treeb703539e57a92339dafb9cac5c8b49c1040edc6c
parentcb41817568900d52d3768a91f703f04696f6b702
parentb988327f1fe531cc0e1f1cde73d2b18c05850548
Merge branch '5926-parameterize-max-slots'

closes #5926