[pam_mount: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/pam_mount

[Till Maas]

commit e918668727e95eb50949fd2fbd628509d4475139
Merge: 6ba5c19 97bdcf7
Author: Till Maas <opensource at till.name>
Date:   Thu Sep 5 22:36:18 2013 +0200

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

 pam_mount.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc pam_mount.spec
index 713ed96,5cb61e7..b31a2dd
--- a/pam_mount.spec
+++ b/pam_mount.spec
@@@ -143,9 -142,9 +143,12 @@@ rm -rf $RPM_BUILD_ROO
  %exclude %{_libdir}/pkgconfig/libcryptmount.pc
  
  %changelog
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.13-5.20130707git966c6bea
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
 +* Thu Sep 05 2013 Till Maas <opensource at till.name> - 2.14-1
 +- Update to new release
 +
  * Sun Jul 07 2013 Till Maas <opensource at till.name> - 2.13-4.20130707git966c6bea
  - Update to GIT snapshot due to missing releases
  - Remove lz compression handling from SPEC