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

[Stephen Gallagher]

commit 921e69979891818c34d175df74a236fc3e7924d1
Merge: 2210798 0a6f65d
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Thu Jan 2 08:22:41 2014 -0500

    Merge branch 'master' into f18

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