Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-apt
authorMarkelov Anton <doublic@gmail.com>
Sun, 2 Jun 2013 23:10:03 +0000 (10:10 +1100)
committerMarkelov Anton <doublic@gmail.com>
Sun, 2 Jun 2013 23:10:03 +0000 (10:10 +1100)
commit6283f6cf7214c17efe628858e98d28e5526c79fd
treeb776626c711468dd248877238dbe10d9f28aa4ff
parent1378cd5a441ee6dc41a8b85fe8d604deff7d97d6
parent18ee4cc6c9eb8d16becfec68254d8955eb10c7d5
Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-apt

Conflicts:
.travis.yml
Modulefile
.travis.yml
Modulefile