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

[Peter Borsa]

commit 1eff28e8678936bbec8b520056bf9f866f043471
Merge: 6d3b6bc 6ca578c
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Sat May 10 20:46:33 2014 +0200

    Merge branch 'master' into el6

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