Merge branch 'master' of github.com:frameos/rubygem-chef-server-api-rpm

Sean P. Kane · Sean P. Kane · commit f2e81bf1cec8 · 2012-09-11T12:55:02.000-07:00
Conflicts:
	rubygem-chef-server-api.spec
diff --git a/rubygem-chef-server-api.spec b/rubygem-chef-server-api.spec
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 * Tue Sep 11 2012 Sean P. Kane <spkane00@gmail.com> - 10.14.2-1
 - bumped version 10.14.2
 
+* Mon Sep 10 2012 Sergio Rubio <rubiojr@frameos.org> - 10.14.0-1
+- bumped version 10.14.0
+
 * Wed Aug 31 2012 Sean P. Kane <spkane00@gmail.com> - 10.12.0-1
 - bumped version 10.12.0
 

-Original file line number
+Diff line change
 * Tue Sep 11 2012 Sean P. Kane <[email protected]> - 10.14.2-1
 - bumped version 10.14.2
 +* Mon Sep 10 2012 Sergio Rubio <[email protected]> - 10.14.0-1
 +- bumped version 10.14.0
++
 * Wed Aug 31 2012 Sean P. Kane <[email protected]> - 10.12.0-1
 - bumped version 10.12.0