Merge branch 'master' of orgmode.org:org-mode
commitc462683ba2fe009ef0450b66ad425acf0a91dfd7
authorBastien Guerry <bzg@altern.org>
Thu, 25 Aug 2011 21:42:43 +0000 (25 23:42 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 25 Aug 2011 21:42:43 +0000 (25 23:42 +0200)
tree7947455fa625be94142669e6ba9ea69d027cfefe
parent8bd2ff192e519f0de7d42efb998c3c24655151f7
parent4574cc11bcb22a42157ed67a4141558f23ccf730
Merge branch 'master' of orgmode.org:org-mode