Merge branch 'master' of github.com:volkszaehler/vzlogger

Conflicts:
	src/meter.c
This commit is contained in:
Steffen Vogel 2011-12-05 21:51:23 +01:00
commit 9452422f4b

Diff content is not available