Merge Master into Green#225

Merged

braddaw merged 4 commits into

feature/greenfrom

May 6, 2014

Commits on Apr 23, 2014

TRQ-2547. Fix a valgrind issue with id_map's destructor.
David Beer
committed
Fix some scaffolding files.
David Beer
committed
trq-2547 cleaned up some valgrind issues.
braddaw
committed
Fixed unit tests.
braddaw
committed