mdorenka/fhemduino — pull request #25 by sidey79 (2014-08-31 13:53:35+00:00)
Title: Merge trunk and master

Bring the current trunk into the master