[drupal6-ctools/el6: 5/5] Merge branch 'master' into el6

[Peter Borsa]

commit ce6b91f74f5379c5da9ee22ac48de44af4a23fc8
Merge: 6375127 ba61fa9
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Thu Aug 16 23:41:09 2012 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	drupal6-ctools.spec

 .gitignore          |    2 +-
 drupal6-ctools.spec |   21 +++++++++++++++------
 sources             |    2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)
---