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

[Stephen Gallagher]

commit 76653a7fdb3df4df5132e5f5773c604364e12060
Merge: 0ab14e0 610222a
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Fri Oct 11 08:15:04 2013 -0400

    Merge branch 'master' into el6

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