Merge pull request #23 from haus/python_properties
authorRyan Coleman <ryan@puppetlabs.com>
Fri, 24 Feb 2012 19:20:52 +0000 (11:20 -0800)
committerRyan Coleman <ryan@puppetlabs.com>
Fri, 24 Feb 2012 19:20:52 +0000 (11:20 -0800)
Check if python-software-properties is defined before attempting to define it.

Reviewed and tested by Ryan Coleman (ryan@puppetlabs.com)

1  2 
manifests/init.pp
spec/classes/apt_spec.rb

Simple merge
Simple merge