Compile error fix
Merge branch 'master' of github.com:pararthshah/snapr

Conflicts:
	glib-core/hash_par.h