Merge branch 'master' of orgmode.org:org-mode
commit7520cf33d9e399019da4546f562b4d677454dadd
authorBastien Guerry <bzg@altern.org>
Mon, 8 Sep 2014 13:00:00 +0000 (8 15:00 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 8 Sep 2014 13:00:00 +0000 (8 15:00 +0200)
treed796e5f5fba4d245143ff2f4c84ed8641d0c7f27
parent59d2f28024c358c88060e6c8d8ac1e7db76b6738
parentb5c9de618e9a89b339505c6b8643b7e7bf46f9d7
Merge branch 'master' of orgmode.org:org-mode