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

[Peter Borsa]

commit c1952e8d9ce98b2df3fe4d34a688d458fc7c4c7e
Merge: 6b8505f 5fba966
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Thu Apr 4 08:25:42 2013 +0200

    Merge branch 'master' into el5

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