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

[Stephen Gallagher]

commit 13fd50f724ee3acc22bf77b981dad0d3542c16a7
Merge: f9f9c31 b3b7f79
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Nov 5 20:59:16 2013 -0500

    Merge branch 'master' into el6

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