Merge branch 'master' of git+ssh://orgmode.org/~/worg
authorSuvayu Ali <fatkasuvayu+linux@gmail.com>
Wed, 6 Mar 2013 17:06:48 +0000 (18:06 +0100)
committerSuvayu Ali <fatkasuvayu+linux@gmail.com>
Wed, 6 Mar 2013 17:06:48 +0000 (18:06 +0100)
commit47ba2e430f3281e1770fcd96bd1e6528e8f2ff74
treec9f2b45c8a0efcb989ddd0f737507141b7496de6
parentda31746f7577c8a80142b899287daf4ffe25afdf
parentad04e0aede16092fc8e77ee365bae3d14f11308c
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
exporters/beamer/ox-beamer.org