[python-djblets/f18: 2/2] Merge branch 'master' into f18

[Stephen Gallagher]

commit 43241f7fd0beb8c944c4b3c5088fbf737abb19de
Merge: 92b1029 718470a
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Wed Nov 27 15:50:42 2013 -0500

    Merge branch 'master' into f18

 .gitignore          |    1 +
 python-djblets.spec |    8 +++++++-
 sources             |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---