something
Merge branch 'master' of github.com:vranki/siilihai-client

Conflicts:
	debian/changelog
	src/reader/siilihai.cpp
	src/src.pro