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

[Stephen Gallagher]

commit 0a06d9bfd56757173b546ff02663272c440e97e7
Merge: 13fd50f 718470a
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Wed Nov 27 15:50:55 2013 -0500

    Merge branch 'master' into el6

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