[ppp/f19: 2/2] Merge branch 'master' into f19

[Michal Sekletar]

commit 27889ba5ca0d55790b5a5492e2333533d53d8af9
Merge: 2adf791 0d4a41f
Author: Michal Sekletar <msekleta at redhat.com>
Date:   Thu Aug 1 15:09:40 2013 +0200

    Merge branch 'master' into f19
    
    Conflicts:
    	ppp.spec

 ppp.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc ppp.spec
index 2687477,9adc7de..f8b2fd6
--- a/ppp.spec
+++ b/ppp.spec
@@@ -3,7 -3,7 +3,7 @@@
  Summary: The Point-to-Point Protocol daemon
  Name: ppp
  Version: 2.4.5
- Release: 31%{?dist}
 -Release: 33%{?dist}
++Release: 32%{?dist}
  License: BSD and LGPLv2+ and GPLv2+ and Public Domain
  Group: System Environment/Daemons
  URL: http://www.samba.org/ppp
@@@ -171,7 -171,10 +171,10 @@@ mkdir -p %{_localstatedir}/lock/ppp 2>&
  %doc PLUGINS
  
  %changelog
 -* Thu Aug 01 2013 Michal Sekletar <msekleta at redhat.com> - 2.4.5-33
++* Thu Aug 01 2013 Michal Sekletar <msekleta at redhat.com> - 2.4.5-32
+ - fix post installation scriptlet
+ 
 -* Fri Jul 12 2013 Michal Sekletar <msekleta at redhat.com> - 2.4.5-32
 +* Tue Jul 30 2013 Michal Sekletar <msekleta at redhat.com> - 2.4.5-31
  - don't ship /var/lock/ppp in rpm payload and create it in %post instead
  - fix installation of tmpfiles.d configuration
  - enable hardened build