lbl-srg/modelica-buildings — pull request #316 by mwetter (2014-11-13 00:33:20+00:00)
Title: Merge master to issue 313 (for heater/cooler)

This merges the new heater/cooler.