[ReviewBoard/f18: 4/4] Merge branch 'master' into f18

[Stephen Gallagher]

commit e4f0973ade558a3dc3810abb4a4fdf63b3a587e6
Merge: 9e4d757 2c790ff
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Jun 3 10:39:57 2013 -0400

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	ReviewBoard.spec
    	sources

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