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

[Peter Borsa]

commit 0bd789699fb60dc4ec72c54eac66a7dfe96e11dc
Merge: a017f04 8242b80
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Wed Nov 27 18:59:16 2013 +0100

    Merge branch 'master' into el5

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