[drupal6-rules/el5: 7/7] Merge branch 'master' into el5

[Peter Borsa]

commit 1205119f97283f4719075bf047880d3864761432
Merge: 7eee13e ef29e84
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Wed Jun 12 10:48:00 2013 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	drupal6-rules.spec

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