[pynag: 4/4] Merge branch 'master' of ssh://pkgs.fedoraproject.org/pynag

[Tomas Edwardsson]

commit 00e9c9a46234e02ff91f0621ed2465f89f6f93ad
Merge: d1c8070 74f39cc
Author: Tomas Edwardsson <tommi at tommi.org>
Date:   Sat Nov 2 22:48:30 2013 +0000

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/pynag
    
    Conflicts:
    	pynag.spec

 pynag.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc pynag.spec
index 0d470ca,35c28ad..851f5b4
--- a/pynag.spec
+++ b/pynag.spec
@@@ -70,12 -70,9 +70,15 @@@ rm -fr $RPM_BUILD_ROO
  %doc examples/README
  
  %changelog
- * Sat Nov  2 2013 Tomas Edwardsson <tommi at tommi.org> 0.7.0-1
++* Sat Nov  0 2013 Tomas Edwardsson <tommi at tommi.org> 0.7.0-1
 +- New upstream version
 +
 +* Thu Jun 28 2013 Tomas Edwardsson <tommi at tommi.org> 0.5.0-1
 +- New upstream version
 +
+ * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.9-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Thu Apr 30 2013 Tomas Edwardsson <tommi at tommi.org> 0.4.9-1
  - New upstream version