[reposurgeon/epel7: 4/4] Merge branch 'f20' into epel7

[Christopher Meng]

commit 9afdb606b6ffb0c904c1d014427f49cfefbecf7a
Merge: 9ebb5b7 49f8d74
Author: Christopher Meng <i at cicku.me>
Date:   Thu Aug 28 09:24:15 2014 +0800

    Merge branch 'f20' into epel7
    
    Conflicts:
    	reposurgeon.spec

 .gitignore       |    1 +
 reposurgeon.spec |    5 ++++-
 sources          |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc reposurgeon.spec
index bb31dc6,bfe834e..92177f2
--- a/reposurgeon.spec
+++ b/reposurgeon.spec
@@@ -41,6 -41,12 +41,9 @@@ make chec
  %{_mandir}/man1/repopuller.1*
  
  %changelog
+ * Thu Aug 28 2014 Christopher Meng <rpm at cicku.me> - 3.11-1
+ - When converting SVN, ignore explicit .gitignores created by git-svn.
+ 
 -* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
  * Tue Apr 22 2014 Christopher Meng <rpm at cicku.me> - 3.10-1
  - Finer control over filtering with caC flags.
  - New setfield command for tweaking object attributes from lift scripts.