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

[Stephen Gallagher]

commit e0138d4db41ff4056c20260891c1bb5ade7d45cc
Merge: e49afbf 8ff753f
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Thu Apr 19 20:59:32 2012 -0400

    Merge branch 'master' into el6

 .gitignore          |    3 ++
 python-djblets.spec |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 sources             |    2 +-
 3 files changed, 58 insertions(+), 2 deletions(-)
---