Merge branch 'master' of orgmode.org:org-mode
commit2eb16005d02e02f97dd48bffa9c74aa56612f97a
authorBastien Guerry <bzg@altern.org>
Wed, 6 Mar 2013 22:41:36 +0000 (6 23:41 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 6 Mar 2013 22:41:36 +0000 (6 23:41 +0100)
tree63cd4e09dbc039ffd533fc6eeed833a5e4a8d17e
parentb7c776418868966b980a0b1be89bf7bfabde7685
parent37d47a33d91609969d4770b900445b07cc44d836
Merge branch 'master' of orgmode.org:org-mode