[nwipe: 2/2] update to version 0.10

[rebus]

commit 5bc97c015373803f71ad993bafda5b286fb920c6
Merge: a795746 fe68b62
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Fri Aug 10 23:49:52 2012 +0200

    update to version 0.10

 nwipe.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc nwipe.spec
index 00dbcb7,296a344..e1071a1
--- a/nwipe.spec
+++ b/nwipe.spec
@@@ -52,9 -52,9 +52,13 @@@ rm -rf %{buildroot
  %{_mandir}/man1/%{name}.1.gz
  
  %changelog
++<<<<<<< HEAD
 +* Fri Aug 10 2012 Michal Ambroz <rebus at, seznam.cz> 0.10-1
 +- upgrade to version 0.10
 +
+ * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Sun Apr 08 2012 Michal Ambroz <rebus at, seznam.cz> 0.08-1
  - upgrade to version 0.08