[RBTools/el6: 3/3] Merge branch 'master' into el6

[Stephen Gallagher]

commit dcb9e3432a0041d7db9f4cd965f3a51529fd7256
Merge: 56c447a 142c31e
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Jan 19 08:05:12 2015 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                                         |    8 +-
 ...dd-C-option-to-commit-patches-immediately.patch |  116 --------------------
 0005-Fix-I-with-svn-repositories.patch             |   33 ------
 0006-Fix-perforce-options-access.patch             |   35 ------
 ...uzzy-search-in-setup-repo-to-match-reposi.patch |   84 --------------
 0008-Properly-generate-parent-diffs-in-git.patch   |   47 --------
 RBTools.spec                                       |   17 +++-
 sources                                            |    2 +-
 8 files changed, 24 insertions(+), 318 deletions(-)
---
diff --cc RBTools.spec
index 1b4e718,20acea8..458dd8e
--- a/RBTools.spec
+++ b/RBTools.spec
@@@ -19,10 -19,8 +19,11 @@@ BuildRequires:  python-deve
  BuildRequires:  python-setuptools
  Requires:       python-setuptools
  Requires:       python-simplejson
+ Requires:       python-six
  
 +# EL6-only
 +Requires:       python-argparse
 +
  ### Patches ###
  
  # Upstream