[python-configshell: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-configshell

[Andy Grover]

commit ccfd88821343a384ee6264a42f20aaad2adf9cbf
Merge: 3ac4a81 6510228
Author: Andy Grover <agrover at redhat.com>
Date:   Tue Jul 31 10:44:03 2012 -0700

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-configshell

 python-configshell.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc python-configshell.spec
index ad47f39,a61c74f..db5c60a
--- a/python-configshell.spec
+++ b/python-configshell.spec
@@@ -34,10 -40,9 +34,13 @@@ rm -rf %{buildroot
  %doc COPYING README
  
  %changelog
- * Tue Jan 10 2012 Andy Grover <agrover at redhat.com> - 1:1.1.fb5-1
++* Tue Jul 31 2012 Andy Grover <agrover at redhat.com> - 1:1.1.fb5-1
 +- New upstream release
 +- Update Source URL to proper tarball
 +
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.1.fb4-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Tue Jan 10 2012 Andy Grover <agrover at redhat.com> - 1:1.1.fb4-1
  - New upstream release