[drupal7-ckeditor/el6: 3/3] Merge branch 'master' into el6

[Peter Borsa]

commit d5027a243b79a7d4266ccd27c87f32e5cc22f28d
Merge: 1eff28e 87464be
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Thu Aug 7 14:26:58 2014 +0200

    Merge branch 'master' into el6

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