[ReviewBoard/el6: 5/5] Merge branch 'master' into el6

[Stephen Gallagher]

commit 8629be6665384aaaf67318ac472f3a7f7d56d7b9
Merge: 5b5e6c0 05e46e7
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Wed Apr 25 14:27:48 2012 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	ReviewBoard.spec

 .gitignore       |    1 +
 ReviewBoard.spec |   21 +++++++++++++++++----
 sources          |    2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)
---
diff --cc ReviewBoard.spec
index 1caaaf7,4264df8..9cd92aa
--- a/ReviewBoard.spec
+++ b/ReviewBoard.spec
@@@ -25,10 -25,10 +25,10 @@@ Requires:       pysv
  Requires:       python-flup
  Requires:       python-nose
  Requires:       pytz
 -Requires:       python-pygments >= 1.4
 +Requires:       python-pygments >= 1.1.1
- Requires:       django-evolution >= 0.6.5
+ Requires:       django-evolution >= 0.6.7
  Requires:       python-recaptcha-client
 -Requires:       python-paramiko >= 1.7.6
 +Requires:       python-paramiko
  Requires:       python-memcached
  Requires:       python-dateutil