.
Merge branch 'master' of https://github.com/sfilargi/stavros

Conflicts:
	configure
	configure.ac
	obj/server/Makefile.am
	obj/server/Makefile.in