[nfsometer/f18: 11/11] fix merge

[Peter Robinson]

commit 9e1a8dcae43e21f0a508038a89bb6cf299d639bd
Merge: f7c179a 788011c
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Nov 8 16:30:34 2013 +0000

    fix merge

 .gitignore     |    3 +--
 nfsometer.spec |   17 ++++++++++++++---
 sources        |    2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 3e044c2,f04d4d7..21fd96f
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,1 @@@
--/nfsometer-1.3.tar.gz
--/nfsometer-1.5.tar.gz
+ /nfsometer-1.6.tar.gz
diff --cc nfsometer.spec
index b3b3456,185d5ff..e6d4d24
--- a/nfsometer.spec
+++ b/nfsometer.spec
@@@ -41,9 -43,14 +43,15 @@@ python setup.py install -O1 --skip-buil
  #For noarch packages: sitelib
  %{python_sitelib}/*
  
 +%doc COPYING README
  
  %changelog
+ * Fri Nov  8 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.6-1
+ - Update to 1.6
+ 
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Tue Mar 26 2013 Weston Andros Adamson <dros at netapp.com> 1.5-1
  - Updated to the latest upstream release: 1.5