Steffen Vogel 0eb37cd777 Merge branch 'master' of github.com:volkszaehler/vzlogger ... Conflicts: src/d0.c src/obis.c		2011-11-21 00:47:47 +01:00
..
logger	Merge branch 'master' of github.com:volkszaehler/vzlogger	2011-11-21 00:47:47 +01:00
reader	changed a lot.. (configuration parsing still not finished: bin/logger/src/options.c)	2011-10-07 22:26:03 +02:00