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

[Stephen Gallagher]

commit 0e6a4ceb223d0f602d93b84b4ef0fc286e8bcd4f
Merge: ae48584 2c790ff
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Jun 3 10:41:27 2013 -0400

    Merge branch 'master' into el6

 .gitignore       |    1 +
 ReviewBoard.spec |   69 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 sources          |    2 +-
 3 files changed, 66 insertions(+), 6 deletions(-)
---
diff --cc ReviewBoard.spec
index a3175b0,a80d07b..d71063a
--- a/ReviewBoard.spec
+++ b/ReviewBoard.spec
@@@ -18,18 -18,17 +18,18 @@@ BuildRequires:  python-mimepars
  BuildRequires:  python-sphinx
  BuildRequires:  python-recaptcha-client
  BuildRequires:  pysvn
 -BuildRequires:  python-pygments >= 1.4
 +BuildRequires:  python-pygments >= 1.1.1
  BuildRequires:  python-nose
  BuildRequires:  pytz
 -BuildRequires:  python-paramiko >= 1.7.6
 +BuildRequires:  python-paramiko
  BuildRequires:  python-dateutil
  BuildRequires:  python-mimeparse
 -BuildRequires:  python-markdown >= 2.2.1
 +BuildRequires:  python-markdown
  BuildRequires:  python-docutils
  BuildRequires:  python-slimit
 +BuildRequires:  nodejs-less
  
- Requires:       python-djblets >= 0.7.12
+ Requires:       python-djblets >= 0.7.15
  Requires:       python-imaging
  Requires:       httpd
  Requires:       mod_wsgi