Merge remote-tracking branch 'origin/pr/2'
[grml-etc.git] / etc / resolv.conf.template
2006-10-18 Michael Prokopinitial checkin