Merge branch 'master' of orgmode.org:org-mode
commit88fd65f251dc47abfa587d6c14fb243ca4a0f2a3
authorBastien Guerry <bzg@altern.org>
Fri, 27 Jul 2012 22:57:14 +0000 (28 00:57 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 27 Jul 2012 22:57:14 +0000 (28 00:57 +0200)
tree0b28226deced4dc0267c2667bc8d21cd458ce98b
parentabbea596111611a945d73783b3e8790e76599740
parent144f2a3f9e6d610c19e8a8b086f8004da3909373
Merge branch 'master' of orgmode.org:org-mode