[gh-275] Merging from testing into staging -c 1369

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@1462 20a16fea-79d4-4915-8869-1ea9d5ebf173

[gh-275] Merging from testing into staging -c 1369
a8d5017b · Tim Steiner · 7f9b8981 · a8d5017b · a8d5017b · a8d5017b
Commit a8d5017b authored 13 years ago by Tim Steiner
--- a/sites/all/libraries/codemirror/mode/diff/index.html
+++ b/sites/all/libraries/codemirror/mode/diff/index.html
--- a/sites/all/libraries/codemirror/mode/gfm/gfm.js
+++ b/sites/all/libraries/codemirror/mode/gfm/gfm.js
--- a/sites/all/libraries/codemirror/mode/gfm/index.html
+++ b/sites/all/libraries/codemirror/mode/gfm/index.html
--- a/sites/all/libraries/codemirror/mode/groovy/groovy.js
+++ b/sites/all/libraries/codemirror/mode/groovy/groovy.js
--- a/sites/all/libraries/codemirror/mode/groovy/index.html
+++ b/sites/all/libraries/codemirror/mode/groovy/index.html
--- a/sites/all/libraries/codemirror/mode/haskell/haskell.js
+++ b/sites/all/libraries/codemirror/mode/haskell/haskell.js
--- a/sites/all/libraries/codemirror/mode/haskell/index.html
+++ b/sites/all/libraries/codemirror/mode/haskell/index.html
--- a/sites/all/libraries/codemirror/mode/htmlmixed/htmlmixed.js
+++ b/sites/all/libraries/codemirror/mode/htmlmixed/htmlmixed.js
--- a/sites/all/libraries/codemirror/mode/htmlmixed/index.html
+++ b/sites/all/libraries/codemirror/mode/htmlmixed/index.html
--- a/sites/all/libraries/codemirror/mode/javascript/index.html
+++ b/sites/all/libraries/codemirror/mode/javascript/index.html
--- a/sites/all/libraries/codemirror/mode/javascript/javascript.js
+++ b/sites/all/libraries/codemirror/mode/javascript/javascript.js
--- a/sites/all/libraries/codemirror/mode/jinja2/index.html
+++ b/sites/all/libraries/codemirror/mode/jinja2/index.html
--- a/sites/all/libraries/codemirror/mode/jinja2/jinja2.js
+++ b/sites/all/libraries/codemirror/mode/jinja2/jinja2.js
--- a/sites/all/libraries/codemirror/mode/lua/index.html
+++ b/sites/all/libraries/codemirror/mode/lua/index.html
--- a/sites/all/libraries/codemirror/mode/lua/lua.js
+++ b/sites/all/libraries/codemirror/mode/lua/lua.js
--- a/sites/all/libraries/codemirror/mode/markdown/index.html
+++ b/sites/all/libraries/codemirror/mode/markdown/index.html
--- a/sites/all/libraries/codemirror/mode/markdown/markdown.css
+++ b/sites/all/libraries/codemirror/mode/markdown/markdown.css
--- a/sites/all/libraries/codemirror/mode/markdown/markdown.js
+++ b/sites/all/libraries/codemirror/mode/markdown/markdown.js
--- a/sites/all/libraries/codemirror/mode/ntriples/index.html
+++ b/sites/all/libraries/codemirror/mode/ntriples/index.html
--- a/sites/all/libraries/codemirror/mode/ntriples/ntriples.js
+++ b/sites/all/libraries/codemirror/mode/ntriples/ntriples.js