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

[Stephen Gallagher]

commit 5423d091aaaa791504a5b9f271621388e1bf3f73
Merge: 0ecb0e1 ff2111b
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Oct 28 09:54:50 2014 -0400

    Merge branch 'master' into epel7

 .gitignore                      |    1 +
 FED04-Soften-dependencies.patch |   17 ++++++++---------
 ReviewBoard.spec                |    5 ++++-
 sources                         |    2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)
---