Merge branch '2257-inequality-conditions'
authorTom Clegg <tom@curoverse.com>
Fri, 14 Mar 2014 17:42:20 +0000 (13:42 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 14 Mar 2014 17:42:20 +0000 (13:42 -0400)
closes #2257


Trivial merge