From: mh <mh@immerda.ch>
Date: Sun, 15 Apr 2012 11:18:59 +0000 (+0200)
Subject: Merge remote-tracking branch 'shared/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=bdc244667161c3fa9140632c535921db61468800;p=puppet-apt.git

Merge remote-tracking branch 'shared/master'

Conflicts:
	README
---

bdc244667161c3fa9140632c535921db61468800