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

[Stephen Gallagher]

commit e246dde057f1c5d3f1a19f11dc3f94bc24619963
Merge: ddd102c 3c31473
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Wed Nov 13 15:26:06 2013 -0500

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

 .gitignore                                  |    1 +
 FED04-Compress-JavaScript-with-SlimIt.patch |   25 -------------------------
 ReviewBoard.spec                            |   12 +++++++-----
 sources                                     |    2 +-
 4 files changed, 9 insertions(+), 31 deletions(-)
---