tree ca72b9cbab2e69a98085973940360da4e789acec
parent f56d9820b3940f0d7d5d1756d4756bcdc72bb098
parent 634be9ec6d630c6aaba9550cd0732d211ac9f224
author Robert Story <rstory@localhost> 1411654495 -0400
committer Robert Story <rstory@localhost> 1411654495 -0400

Merge branch 'V5-5-patches' into V5-6-patches

* V5-5-patches:
  remove bad assert check