Merge branch 'master' of github.com:netmanagers/puppet-dnsmasq
Minor fix of inline template.

Change concat dependency to puppetlabs' one.