Merge branch 'master' of orgmode.org:org-mode

README_maintainer

@@ -262,12 +262,16 @@ So the way I have been doing things with Emacs is this:
 * Copyright assignments
 
   The maintainer needs to keep track of copyright assignments.  Even
-  better, find a volunteer to do this.  The list of all contributors
-  from who we have the papers is kept on Worg at
-  http://orgmode.org/worg/org-contribute.php, so that committers can
-  check if a patch can go into the core.  The assignment process does
-  not allways go smoothly, and it has happened several times that it
-  gets stuck or forgotten at the FSF.  Emails from the paper submitter
-  have been ignored in the past, but an email from me as the
-  maintainer of Org mode has usually fixed such cases within a few
-  days.
+  better, find a volunteer to do this.  
+
+  The list of all contributors from who we have the papers is kept on
+  Worg at http://orgmode.org/worg/org-contribute.php, so that
+  committers can check if a patch can go into the core.
+
+  The assignment process does not allways go smoothly, and it has
+  happened several times that it gets stuck or forgotten at the FSF.
+  The contact at the FSF for this is: copyright-clerk@fsf.org 
+
+  Emails from the paper submitter have been ignored in the past, but
+  an email from me (Carsten) as the maintainer of Org mode has usually
+  fixed such cases within a few days.

lisp/ob-sh.el

@@ -45,6 +45,12 @@
   "Command used to invoke a shell.
 This will be passed to  `shell-command-on-region'")
 
+(defcustom org-babel-sh-var-quote-fmt
+  "$(cat <<'BABEL_TABLE'\n%s\nBABEL_TABLE\n)"
+  "Format string used to escape variables when passed to shell scripts."
+  :group 'org-babel
+  :type 'string)
+
 (defun org-babel-execute:sh (body params)
   "Execute a block of Shell commands with Babel.
 This function is called by `org-babel-execute-src-block'."
@@ -100,13 +106,13 @@ var of the same value."
                           (if (listp el)
                               (mapcar #'deep-string el)
 			    (org-babel-sh-var-to-sh el sep))))
-	(format "$(cat <<'BABEL_TABLE'\n%s\nBABEL_TABLE\n)"
+	(format org-babel-sh-var-quote-fmt
 		(orgtbl-to-generic
 		 (deep-string (if (listp (car var)) var (list var)))
 		 (list :sep (or sep "\t")))))
     (if (stringp var)
 	(if (string-match "[ \t\n\r]" var)
-	    (format "$(cat <<BABEL_STRING\n%s\nBABEL_STRING\n)" var)
+	    (format org-babel-sh-var-quote-fmt var)
 	  (format "%s" var))
       (format "%S" var))))