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

[Konstantin Ryabitsev]

commit 7a89227d31569029643023b7fe1b32b5f0a79713
Merge: fc02b35 7a9bfe8
Author: Konstantin Ryabitsev <mricon at kernel.org>
Date:   Mon Nov 18 17:20:38 2013 -0500

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

 pam_url.spec |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)
---
diff --cc pam_url.spec
index b5b8e14,5b0ece1..ffa492e
--- a/pam_url.spec
+++ b/pam_url.spec
@@@ -31,9 -31,15 +31,19 @@@ make DESTDIR=%{buildroot} pamlib=%{_lib
  
  
  %changelog
- * Mon Nov 18 2013 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.3.3-1
++<<<<<<< HEAD
++* Mon Nov 18 2013 Konstantin Ryabitsev <icon at fedoraproject.org> - 1:0.3.3-1
 +- Upstream 0.3.3 with minor new features.
 +
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.3.2-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.3.2-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
+ * Thu Dec 06 2012 Dan Horák <dan[at]danny.cz> - 0.3.2-2
+ - fix build on all 64-bit arches
+ 
  * Tue Dec 04 2012 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.3.2-1
  - Upstream 0.3.2 with fixes for correct pam stacking.