Merge branch 'master' of git@github.com:vagonbar/GNUnetwork

Conflicts:
	gn/libtimer/timer.pyc