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

[Peter Borsa]

commit 6d3b6bcc538109ae28857c70fee8f3589909be05
Merge: 64a413c 56597ec
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Thu Sep 26 12:53:52 2013 +0200

    Merge branch 'master' into el6

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