[python-cltk/epel7: 3/3] Merge remote-tracking branch 'origin/master' into epel7

[Parag Nemade]

commit 3faece2a72f6e238b6cc304538fd52c6db605c5f
Merge: 3d9e802 76843fd
Author: Parag Nemade <pnemade at redhat.com>
Date:   Fri Nov 7 22:20:54 2014 +0530

    Merge remote-tracking branch 'origin/master' into epel7

 .gitignore       |    2 ++
 python-cltk.spec |   17 +++++++++++------
 sources          |    2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)
---