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

[Stephen Gallagher]

commit 2a4c3677cb43b71e99e32eadf843f4715ea10fa6
Merge: 7c4f970 022ae8a
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Fri Aug 22 14:30:42 2014 -0400

    Merge branch 'f20' into el6

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