From: Micah Anderson <micah@riseup.net>
Date: Sun, 26 May 2013 21:04:05 +0000 (-0400)
Subject: Merge branch 'master' into leap
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=61a2f4894898baa98dbaaba7b69b7198864ca04a;p=puppet-apt.git

Merge branch 'master' into leap
---

61a2f4894898baa98dbaaba7b69b7198864ca04a