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

[Stephen Gallagher]

commit 2eb3e071870c5ab5b0647c02588be75dc8db5d8c
Merge: a9a6073 09dbeb2
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Thu Aug 15 21:11:46 2013 -0400

    Merge branch 'master' into el6

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