Add a $key_options parameter, which need to work apt-key via proxy.
Merge remote-tracking branch 'upstream/master'
add new puppet version to travis
Fix stdlib version dependency
replace aptitude with apt in apt::force
Location changed:

http://backports.debian.org/news/Backports_integrated_into_the_main_archive/
Add optional architecture qualifier to apt-sources
Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-apt

Conflicts:
	.travis.yml
	Modulefile
fix conflicts
fix 'puppetlabs/stdlib' dependency
Install required_packages before 'apt-get update'

This is necessary when required_packages contains GPG keys that are used for
authenticating other packages. Tested with package ubuntu-cloud-keyring which
is included in Ubuntu main and used by the Ubuntu Cloud Archive.

I think the same problem applies to other *-keyring packages as well.
Add geppetto project definition
Update .gitignore
apt::pin: handling all apt preferences properties

The two forms of APT preferences records (general & specific) can now be
completely and not partially defined. All distribution properties can be passed
as resource parameters. This change is totally backward-compatible.
Fix apt::pin for Puppet 2.6
Improve apt::pin example
Merge branch 'master' into my_changes
Merge pull request #131 from mbornoz/apt-preferences

apt::pin: handling all apt preferences properties
Merge pull request #124 from DavidS/geppetto-infrastructure

Geppetto infrastructure
Merge pull request #122 from strangeman/master

Add a $key_options parameter to apt::key.