travis-prepare
Merge branch 'master' of github.com:jens-na/github-aur

Conflicts:
	travis-prepare