Prepare modulefile for 1st. time module upload
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/example42/puppet-postgresql
Merge branch 'master' of https://github.com/example42/puppet-postgresql

Conflicts:
	Modulefile
Merge branch 'master' of https://github.com/example42/puppet-postgresql
Merge branch 'master' of https://github.com/example42/puppet-postgresql
Merge branch 'master' of https://github.com/example42/puppet-postgresql
Remove concat's deprecated setup call
Use example42's iptables module in the fixtures
Merge pull request #20 from netmanagers/master

Remove concat's deprecated setup call