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

[Stephen Gallagher]

commit 78040d6d0175a78be185b118f3e6b663cd47e67c
Merge: e0138d4 cda16ca
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Wed Apr 25 14:04:10 2012 -0400

    Merge branch 'master' into el6

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