[xmlbeans: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/xmlbeans

[Matt Spaulding]

commit cf032e5531dc13ae08d47ea40f85a6e78043591b
Merge: 8cfea08 96af8a1
Author: Matt Spaulding <mspaulding06 at gmail.com>
Date:   Sun Mar 3 14:43:56 2013 -0800

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/xmlbeans
    
    Conflicts:
    	xmlbeans.spec

 xmlbeans.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc xmlbeans.spec
index 23df94a,543e986..f3a7987
--- a/xmlbeans.spec
+++ b/xmlbeans.spec
@@@ -32,7 -32,7 +32,7 @@@
  
  Name:           xmlbeans
  Version:        2.6.0
--Release:        2%{?dist}%{?with_bootstrap:.boot}
++Release:        3%{?dist}%{?with_bootstrap:.boot}
  Summary:        XML-Java binding tool
  Group:          Development/Libraries
  URL:            http://xmlbeans.apache.org/
@@@ -218,9 -216,9 +218,12 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
- * Sun Mar 03 2013 Matt Spaulding <mspaulding06 at gmail.com> - 2.6.0-2
++* Sun Mar 03 2013 Matt Spaulding <mspaulding06 at gmail.com> - 2.6.0-3
 +- Fixed classpath issue with scripts (#892690)
 +
+ * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Sat Oct 13 2012 Matt Spaulding <mspaulding06 at gmail.com> - 2.6.0-1
  - Updated to latest version 2.6.0 (#824022)
  - Compiles with target 1.5 (#842625)