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

[Stephen Gallagher]

commit 5fad83737660a7ad41b7c1274d40a665ad159c4d
Merge: 12a839d a35d41e
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Thu Oct 10 20:03:18 2013 -0400

    Merge branch 'master' into f18

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