From: Thomas Spalinger <spali@github.com>
Date: Tue, 25 Jun 2013 20:53:14 +0000 (+0200)
Subject: Merge branch 'master' into my_changes
X-Git-Tag: 1.2.0~2^2~1
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;ds=sidebyside;h=ca810b37c67eae10995df645327699d2fea4b3ef;p=puppet-modules%2Fpuppetlabs-apt.git

Merge branch 'master' into my_changes
---

ca810b37c67eae10995df645327699d2fea4b3ef