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

[Stephen Gallagher]

commit ed87d56dd899a7891b685daf20dfabf74340f505
Merge: b97d748 37398af
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Jun 3 09:30:42 2013 -0400

    Merge branch 'master' into el6

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