Merge branch 'master' of orgmode.org:org-mode
commit44435f3ee3eca7fb91505442ae6ea6a9ffe4725f
authorBastien Guerry <bzg@altern.org>
Wed, 26 Oct 2011 21:04:19 +0000 (26 23:04 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 26 Oct 2011 21:04:19 +0000 (26 23:04 +0200)
treeefc3b3e4233b2c02723405a75981658950cfb440
parent2d296c12eae655c87fe9f5056c042ff3c532e0aa
parent71f1c1bed434f42f6890cc27f4ecc69ad732adf7
Merge branch 'master' of orgmode.org:org-mode