Merge branch 'master' of git+ssh://orgmode.org/~/worg

* 'master' of git+ssh://orgmode.org/~/worg:
  org-export-reference: Update tools
  ox-beamer.org: Simplify filters
  Add "Original announcement of the merge of the new exporter"
  Mention org-agenda-dim-blocked-tasks

Conflicts:
	exporters/beamer/ox-beamer.org

diff --cc exporters/beamer/ox-beamer.org
index 4878d21,7bcef2b..e3d5b29
--- 1/exporters/beamer/ox-beamer.org
--- 2/exporters/beamer/ox-beamer.org
+++ b/exporters/beamer/ox-beamer.org
@@@ -124,20 -122,20 +124,20 @@@ As a simple example; the =ox-beamer= tr
  =\alert{bold text}=.  To revert this back to the old behaviour, you
  can you a filter like this:
  #+begin_src emacs-lisp :eval no
 -(defun my-beamer-bold (contents backend info)
 -  (when (eq backend 'beamer)
 -    (replace-regexp-in-string "\\`\\\\[A-Za-z0-9]+" "\\\\textbf" contents)))
 +  (defun my-beamer-bold (contents backend info)
-     (if (not (eq backend 'beamer)) contents
++    (when (eq backend 'beamer)
 +      (replace-regexp-in-string "\\`\\\\[A-Za-z0-9]+" "\\\\textbf" contents)))
  
 -(add-to-list 'org-export-filter-bold-functions 'my-beamer-bold)
 +  (add-to-list 'org-export-filter-bold-functions 'my-beamer-bold)
  #+end_src
  Another example would be to translate +strike through text+ to
  =\structure{strike through text}= with the following filter.
  #+begin_src emacs-lisp :eval no
 -(defun my-beamer-structure (contents backend info)
 -  (when (eq backend 'beamer)
 -    (replace-regexp-in-string "\\`\\\\[A-Za-z0-9]+" "\\\\structure" contents)))
 +  (defun my-beamer-structure (contents backend info)
-     (if (not (eq backend 'beamer)) contents
++    (when (eq backend 'beamer)
 +      (replace-regexp-in-string "\\`\\\\[A-Za-z0-9]+" "\\\\structure" contents)))
  
 -(add-to-list 'org-export-filter-strike-through-functions 'my-beamer-structure)
 +  (add-to-list 'org-export-filter-strike-through-functions 'my-beamer-structure)
  #+end_src
  
  * Structure editing, environments and markup