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

[Matthias Runge]

commit 1727fdbea687ea2ccac6f50de737d0b2a425f837
Merge: 2d94188 ead3124
Author: Matthias Runge <mrunge at redhat.com>
Date:   Fri May 16 19:30:22 2014 +0200

    Merge branch 'master' into epel7

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