[dhcp: 2/3] Merge branch 'f18'

[Jiří Popelka]

commit 6d911cdc3b8aa613bf251e498cd0b91a88b2a53c
Merge: 0c1b70d da00953
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Feb 22 10:55:57 2013 +0100

    Merge branch 'f18'

 dhcp.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc dhcp.spec
index 12fb496,d26b65b..fbd1a2d
--- a/dhcp.spec
+++ b/dhcp.spec
@@@ -577,8 -577,11 +577,11 @@@ don
  
  
  %changelog
+ * Fri Feb 22 2013 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.5-7
+ - remove triggerun condition (#895475)
+ 
 -* Fri Feb 22 2013 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.5-6
 -- bump release number (to stay in sync with rawhide)
 +* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12:4.2.5-6
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
  
  * Thu Jan 24 2013 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.5-5
  - remove missing-ipv6-not-fatal.patch because the concerning code is later