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

[Stephen Gallagher]

commit 22107983b06829666a8e4c5b0c4ac48a0f565045
Merge: 43241f7 ee86555
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Thu Dec 12 13:41:08 2013 -0500

    Merge branch 'master' into f18

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