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

[Matthias Runge]

commit ab1e7c7d71fbf27ca5ff7bca79211ead20ec9621
Merge: 92cc234 8fde01d
Author: Matthias Runge <mrunge at redhat.com>
Date:   Mon Sep 30 14:20:42 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-colorama
    
    Conflicts:
    	python-colorama.spec

 python-colorama.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc python-colorama.spec
index a22498b,f6fb235..2650afe
--- a/python-colorama.spec
+++ b/python-colorama.spec
@@@ -47,9 -47,9 +47,12 @@@ sed -i 's/\r//' README.tx
  %{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
  
  %changelog
 +* Mon Sep 30 2013 Matthias Rugne <mrunge at redhat.com> - 0.2.7-1
 +- uddate to 0.2.7 (rhbz#1010924)
 +
+ * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.5-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Fri Mar 22 2013 Matthias Runge <mrunge at redhat.com> - 0.2.5-1
  - update to 0.2.5 (rhbz#913431)