test
Merge branch 'master' of github.com:alaureijs/puppet-ntp

Conflicts:
	Gemfile