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

[Peter Borsa]

commit edacbbbe12655a9686381d76f2a3bf8145d3aa80
Merge: 84b42f5 ba61fa9
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Thu Aug 16 23:55:44 2012 +0200

    Merge branch 'master' into el5

 .gitignore          |    2 +-
 drupal6-ctools.spec |   19 ++++++++++++++-----
 sources             |    2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)
---