[wondershaper/f18: 3/3] Initial import (#1018498).

[Mosaab Alzoubi]

commit 27890ceeb551d7cc9eb15939acc0cde1e6baf714
Merge: d0f9a47 9419fdc
Author: Mosaab Alzoubi <moceap at hotmail.com>
Date:   Wed Nov 20 11:08:08 2013 +0200

    Initial import (#1018498).

 wondershaper.spec |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --cc wondershaper.spec
index fcdf03b,db0c5dc..b610895
--- a/wondershaper.spec
+++ b/wondershaper.spec
@@@ -1,6 -1,6 +1,10 @@@
  Name:		wondershaper
  Version:	1.2.1
++<<<<<<< HEAD
 +Release:	1%{?dist}
++=======
+ Release:	2%{?dist}
++>>>>>>> master
  Summary:	Simple Network Shaper
  Group:		Applications/Internet
  License:	GPLv2+
@@@ -30,6 -30,9 +34,12 @@@ install -pDm 755 wshaper %{buildroot}/%
  %{_sbindir}/%{name}
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Wed Nov 20 2013 Mosaab Alzoubi <moceap at hotmail.com> - 1.2.1-2
+ - Fix package git commit.
+ 
++>>>>>>> master
  * Tue Nov 19 2013 Mosaab Alzoubi <moceap at hotmail.com> - 1.2.1-1
  - Update to 1.2.1 .
  - Replace URL with main program page.