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

[Petr Šabata]

commit fbccb2e7c5b520dbcbb472bae30b4023fb52fecd
Merge: 4e886e0 3f362d0
Author: Petr Šabata <contyk at redhat.com>
Date:   Tue Jan 31 16:04:09 2012 +0100

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

 libhbalinux.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc libhbalinux.spec
index fe41931,11dac00..556af8b
--- a/libhbalinux.spec
+++ b/libhbalinux.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           libhbalinux
  Version:        1.0.13
--Release:        2%{?dist}
++Release:        3%{?dist}
  Summary:        FC-HBAAPI implementation using scsi_transport_fc interfaces
  Group:          System Environment/Libraries
  License:        LGPLv2
@@@ -68,9 -66,9 +68,12 @@@ f
  %{_libdir}/pkgconfig/%{name}.pc
  
  %changelog
- * Tue Jan 31 2012 Petr Šabata <contyk at redhat.com> - 1.0.13-2
++* Tue Jan 31 2012 Petr Šabata <contyk at redhat.com> - 1.0.13-3
 +- Set SerialNumber to "Unknown" if not found (47d8dca41)
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.13-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Thu Nov 24 2011 Petr Šabata <contyk at redhat.com> - 1.0.13-1
  - 1.0.13 bump
  - Creating the devel subpackage with a pkgconfig file