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

[Paul Wouters]

commit 2103674dcf9f0ee2058558ac15dbb850e3c2e1c9
Merge: 3d6729f 71fca9d
Author: Paul Wouters <paul at xelerance.com>
Date:   Wed Feb 23 00:06:42 2011 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/xl2tpd

 xl2tpd.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc xl2tpd.spec
index 4468c90,f6528c7..45e9df6
--- a/xl2tpd.spec
+++ b/xl2tpd.spec
@@@ -89,9 -89,11 +89,12 @@@ f
  %config(noreplace) %{_sysconfdir}/ppp/*
  %attr(0755,root,root)  %{_initrddir}/xl2tpd
  %dir %{_localstatedir}/run/xl2tpd
 +%ghost %{_localstatedir}/run/xl2tpd/l2tp-control
  
  %changelog
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Tue Nov 30 2010 Paul Wouters <paul at xelerance.com> - 1.2.7-2
  - fix md5 of init script in sources