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

[Stephen Gallagher]

commit 21dde5c7a9132ca6344a4772da1540d2b30daec5
Merge: 78040d6 0f6bdf2
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Jun 5 09:16:48 2012 -0400

    Merge branch 'master' into el6

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