[hg-git/el6: 2/2] Merge branch 'master' into el6

[Christopher Meng]

commit ebc0558d78ced2306df2ae88ca0eac9d7c0dc203
Merge: 624632e bc3e409
Author: Christopher Meng <rpm at cicku.me>
Date:   Tue Dec 3 17:00:12 2013 +0800

    Merge branch 'master' into el6
    
    Conflicts:
    	hg-git.spec

 hg-git.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --cc hg-git.spec
index 01edc50,24521d8..84f29b6
--- a/hg-git.spec
+++ b/hg-git.spec
@@@ -2,7 -2,7 +2,7 @@@
  
  Name:           hg-git
  Version:        0.4.0
- Release:        2%{?dist}
 -Release:        4%{?dist}
++Release:        3%{?dist}
  Summary:        Mercurial Plugin for Communicating with Git Servers
  License:        GPLv2+
  URL:            http://hg-git.github.io
@@@ -36,12 -38,18 +38,15 @@@ identical - Mercurial data does not ge
  
  %files
  %doc COPYING DESIGN.txt README.md TODO.txt
 -%{python2_sitelib}/hggit/
 -%{python2_sitelib}/*.egg-info/
 +%{python_sitelib}/hggit/
 +%{python_sitelib}/*.egg-info/
  
  %changelog
 -* Mon Dec 02 2013 Matěj Cepl <mcepl at redhat.com> - 0.4.0-4
++* Mon Dec 02 2013 Matěj Cepl <mcepl at redhat.com> - 0.4.0-3
+ - We only need python-ordereddict on EPEL<=6.
+ 
 -* Fri Nov 08 2013 Christopher Meng <rpm at cicku.me> - 0.4.0-3
 +* Fri Nov 08 2013 Christopher Meng <rpm at cicku.me> - 0.4.0-2
  - Add missing ordereddict requires.
  
 -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
  * Sat Apr 20 2013 Christopher Meng <rpm at cicku.me> - 0.4.0-1
  - Initial Package.