[drupal7/epel7: 2/2] Merge branch 'master' into epel7

[Peter Borsa]

commit 52e516f76810ae4b710c2f5e73004d6b65e9c49b
Merge: 66439bd 0aa6f9b
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Tue Nov 11 21:21:54 2014 +0100

    Merge branch 'master' into epel7

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