[python-django/epel7: 2/2] Merge branch 'master' into epel7

[Matthias Runge]

commit 2d941889ba73e781fda7190a0932f2f0dbbd1dc9
Merge: 0757e61 84bd006
Author: Matthias Runge <mrunge at redhat.com>
Date:   Wed May 7 10:57:11 2014 +0200

    Merge branch 'master' into epel7

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