Merge branch 'master' of orgmode.org:org-mode
commit0b0588b45b2c1f99717f1672d7476c4e409cdc62
authorBastien Guerry <bzg@altern.org>
Wed, 23 Apr 2014 07:50:41 +0000 (23 09:50 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 23 Apr 2014 07:50:41 +0000 (23 09:50 +0200)
tree0356fd3355683caa58157b2eeb9b8a0b5784cda8
parent096c9e8b712c4e48ced88a38c96b5295174eb05b
parent935b69e0659653ac3e17a3c2132c7499abc2dc57
Merge branch 'master' of orgmode.org:org-mode