tree a28931ed4c1385c37d23b595a6f035e358b1bc84
parent af8c17e6482cb55206c5027098366f60ad8f7cc7
parent bcaab48d9d498361fdd451652773b3b956c7f10c
author Robert Story <rstory@localhost> 1411654490 -0400
committer Robert Story <rstory@localhost> 1411654490 -0400

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

* V5-4-patches:
  remove bad assert check