Merge remote-tracking branch 'cwarden/debian-squeeze-htmldir-fix' into master
authormh <mh@immerda.ch>
Tue, 10 Apr 2012 12:58:55 +0000 (14:58 +0200)
committermh <mh@immerda.ch>
Tue, 10 Apr 2012 12:59:45 +0000 (14:59 +0200)
commitaca8aa110225f13b35bb40f7ad153b5a0167bf58
treef9c1e8e7f104ec2082ad39966fe1143017693e57
parentf06092dda9280b373f7a55dd11b650c729059151
parentc91621a0953d97a83f62205519524708c279a24e
Merge remote-tracking branch 'cwarden/debian-squeeze-htmldir-fix' into master

Pull Request #4
Conflicts:
manifests/host.pp