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

[Stephen Gallagher]

commit 7c04835f7ff0558a83c17295896dbfc93666b545
Merge: 48de1ab df95e90
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Sep 23 09:23:30 2013 -0400

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

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