Merge branch 'master' of https://github.com/rombert/puppetlabs-java into rombert-master

Conflicts:
	manifests/params.pp

spec/classes/java_spec.rb

@@ -74,4 +74,9 @@ describe 'java', :type => :class do
     it { should contain_package('java').with_name('java-1.7.0-openjdk') }
   end
 
+  context 'select default for OpenSUSE 12.3' do
+    let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'OpenSUSE', :operatingsystemrelease => '12.3'}}
+    it { should contain_package('java').with_name('java-1_7_0-openjdk-devel')}
+  end
+
 end