Merge pull request #2 from stv0g/master

new configuration scheme and protocol: "file"
added serial support for D0 protocol (thanks to Kai Krüger, ITWM!)
release 0.3.3
Merge branch 'master' of github.com:volkszaehler/vzlogger
fix for "Something unexpected happened: meter_read_d0:279" problem; Fixed by Bing - THX!
curl_easy_setopt(api->curl, CURLOPT_NOSIGNAL, TRUE); // ensure thread-safe behaviour
less useless error message in meter_read_d0
Merge pull request #4 from r00t-/master

OH MY GOD, I CREATED A GITHUB ACCOUNT FOR A ONE-LINE CHANGE!
typo ("I'd like to buy an "e"!)
revert previous commit
use corrent details->periodic value for s0-meters. was wrong for inexplicable reasons, breaking s0 meters completely.
Merge pull request #5 from r00t-/master

looks good. thanks!
fix crash when an unknown meter protocol is specified in config (and typo-fix in error message)
fix s0-meter regression caused by copying meter.c file from another version!
Merge pull request #6 from r00t-/master

fix crash when an unknown meter protocol is specified in config (and typo-fix in error message)
fix missing 'void *id' parameter to print() call that didn't get enough testing. TODO: add GNU magic to function call to have print's printf-style parameter list checked by compiler...
Merge pull request #7 from r00t-/master

fix missing 'void *id' parameter to print() call that didn't get enough testing.
add gcc printf typecheck magic to print() and fix the three warnings found.

/* http://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html */
void print(log_level_t lvl, const char *format, void *id, ... )
       __attribute__ ((format (printf, 2, 4)));
Merge pull request #8 from r00t-/master

add gcc printf typecheck magic to print() and fix the three warnings found.
Merge remote branch 'upstream/c++-port'

Conflicts:
	include/common.h
	src/api.cpp
	src/config.c
	src/meter.c
	src/protocols/d0.c
	src/threads.c