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

[Stephen Gallagher]

commit 0ab14e0eee69d024b88940f523b9d670c408c991
Merge: 921d15f 2d2f6b6
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Thu Oct 10 19:33:40 2013 -0400

    Merge branch 'master' into el6

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---