[ReviewBoard/f20: 2/2] Merge branch 'master' into f20

[Stephen Gallagher]

commit 53702b59e1dbd36263d918ebf938a67c2c3ee366
Merge: 767dd2e 5433611
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Wed Apr 9 16:09:41 2014 -0400

    Merge branch 'master' into f20

 .gitignore                                         |    1 +
 ...t-building-with-parallel-installed-Django.patch |   31 ++++++++++++++++++++
 FED03-Change-default-cache-file-path.patch         |   28 ++++-------------
 FED04-Soften-requires.txt.patch                    |   10 +++---
 ReviewBoard.spec                                   |   13 ++++++--
 sources                                            |    2 +-
 6 files changed, 54 insertions(+), 31 deletions(-)
---
diff --cc ReviewBoard.spec
index 9ddf6e2,1270025..8450ff1
--- a/ReviewBoard.spec
+++ b/ReviewBoard.spec
@@@ -70,11 -69,11 +69,12 @@@ Requires:       python-django1
  BuildRequires:  python-django-evolution >= 0.6.9
  Requires:       python-django-evolution >= 0.6.9
  
 -# Requires httpd 2.4.7-5 or later in order to support systemd snippets
 -Requires:       httpd >= 2.4.7-5
 +# Requires httpd 2.4.7-3 or later in order to support systemd snippets
 +# Note: this differs on F20 and F21
 +Requires:       httpd >= 2.4.7-3
  
  # Upstream patches awaiting the next release
+ Patch0001: 0001-Support-building-with-parallel-installed-Django.patch
  
  # Fedora-specific patches