emonhub/emonhub — pull request #42 by pb66 (2014-06-27 16:23:45+00:00)
Title: Merge pull request #2 from emonhub/master

fix merge conflict