Merge branch 'master' of orgmode.org:org-mode
commit9dfbb39d11b426196310a06d79b5ad4b2ea2e31e
authorBastien Guerry <bzg@altern.org>
Wed, 8 Aug 2012 12:11:24 +0000 (8 14:11 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 8 Aug 2012 12:11:24 +0000 (8 14:11 +0200)
tree273879232814dc0359871ba10c6ece035e3388b2
parent481c89f388323b26ff289960e39a83ef9b178cb6
parentb523a3edf52c0e335f7409b183fc0c914e93179a
Merge branch 'master' of orgmode.org:org-mode