[warmux: 2/2] Merge branch 'f17' into f18

[Jiří Popelka]

commit 5c89cd1987d25b17116b81cc24dbe728c990b418
Merge: ca6bc98 608ee93
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Nov 27 14:41:56 2012 +0100

    Merge branch 'f17' into f18

 warmux.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc warmux.spec
index b328764,adfcb02..dc4f1c1
--- a/warmux.spec
+++ b/warmux.spec
@@@ -109,9 -109,9 +109,12 @@@ f
  %{_datadir}/warmux
  
  %changelog
+ * Tue Nov 27 2012 Jiri Popelka <jpopelka at redhat.com> - 11.04.1-6
+ - www.wormux.org seems to no longer work
+ 
 +* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11.04.1-5
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 +
  * Tue Apr 17 2012 Jiri Popelka <jpopelka at redhat.com> - 11.04.1-4
  - don't install warmux_files.desktop file (#812533)