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

[Stephen Gallagher]

commit e8a67d20a63c221acd18262d410b894e8b4605e2
Merge: 5e943e3 69e90af
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Jun 11 07:24:52 2012 -0400

    Merge branch 'master' into el6

 .gitignore       |    1 +
 ReviewBoard.spec |   17 +++++++++++++++--
 sources          |    2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)
---