[drupal6/el5: 2/2] Merge branch 'master' into el5

[Peter Borsa]

commit 251cbf08bc9442c39de0e97871b2f53a97233b5b
Merge: 22e18f6 0e19cb6
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Fri Mar 20 18:59:18 2015 +0100

    Merge branch 'master' into el5

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