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

[Peter Borsa]

commit d39b7c81e00e29afb922535cafa10902c2ae22ae
Merge: 9e27f6b 2e2cb56
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Thu Mar 19 08:34:13 2015 +0100

    Merge branch 'master' into epel7

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