From: mh <mh@immerda.ch>
Date: Tue, 6 Sep 2011 20:51:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'puzzle/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=5fa34ec0c8d3c996c4bf36fc685433e24a99e1d3;p=puppet-resolvconf.git

Merge remote-tracking branch 'puzzle/master'
---

5fa34ec0c8d3c996c4bf36fc685433e24a99e1d3