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

[Stephen Gallagher]

commit 9fa7c7b213829fc424d0479720b161d4c8091c0e
Merge: 21dde5c cb9739c
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Jun 12 11:05:26 2012 -0400

    Merge branch 'master' into el6

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