Merge branch '8697-ruby187-compat'
authorTom Clegg <tom@curoverse.com>
Wed, 20 Apr 2016 14:30:04 +0000 (10:30 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 20 Apr 2016 14:30:04 +0000 (10:30 -0400)
commitd7b6ec65cfd774f0d17c96d2baf9b6620c55ad8d
treef80db8fd16eaacb9c6f74e111751b88d299f8237
parent2617eb303578ff5fdf9f24fd4a5de4bfd2144425
parentfd696fac8234ff799aa6ac63819e5e6ac0a8a9d4
Merge branch '8697-ruby187-compat'

refs #8697
refs #8689