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

[Andy Grimm]

commit 0850eabfc1d4374b14bbde2339df0701c0e79ad5
Merge: c37ed50 5a47c9f
Author: Andy Grimm <agrimm at gmail.com>
Date:   Fri Jan 13 14:22:41 2012 -0500

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

 btm.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --cc btm.spec
index 565537f,909fc84..03762e7
--- a/btm.spec
+++ b/btm.spec
@@@ -1,7 -1,7 +1,12 @@@
  Summary:        Bitronix Transaction Manager
  Name:           btm
++<<<<<<< HEAD
 +Version:        2.1.2
 +Release:        1%{?dist}
++=======
+ Version:        2.1.1
+ Release:        4%{?dist}
++>>>>>>> 5a47c9f8e1ce5ab337e1421a425d5f818888eb2b
  Epoch:          0
  License:        LGPLv3
  URL:            http://bitronix.be
@@@ -87,9 -85,9 +92,12 @@@ install -pm 644 %{SOURCE2} $RPM_BUILD_R
  %doc %{_javadocdir}/*
  
  %changelog
- * Wed Jan 11 2012 Andy Grimm <agrimm at gmail.com> - 0:2.1.2-1
++* Fri Jan 13 2012 Andy Grimm <agrimm at gmail.com> - 0:2.1.2-1
 +- Update to 2.1.2
 +
+ * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.1.1-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Thu Sep 07 2011 Andy Grimm <agrimm at gmail.com> - 0:2.1.1-3
  - Fixes for package review