upd
upd
Merge branch 'master' of github.com:ignatenkobrain/libfprint

Conflicts:
	rel-eng/packages/libfprint