Steffen Vogel ef27d17160 Merge branch 'master' of github.com:volkszaehler/volkszaehler.org ... Conflicts: backend/lib/Interpreter/MeterInterpreter.php backend/lib/View/JSON.php		2010-09-19 20:52:13 +02:00
..
AggregatorInterpreter.php	several cosmetic changes	2010-09-19 20:48:19 +02:00
Interpreter.php	several cosmetic changes	2010-09-19 20:48:19 +02:00
MeterInterpreter.php	Merge branch 'master' of github.com:volkszaehler/volkszaehler.org	2010-09-19 20:52:13 +02:00
SensorInterpreter.php	updated docs	2010-07-29 00:04:33 +02:00