Merge branch 'master' of orgmode.org:org-mode
commitc259952b9ebf7ff3aadd359d3c7368d2dbc5d35e
authorBastien Guerry <bzg@altern.org>
Mon, 28 Jul 2014 13:41:14 +0000 (28 15:41 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 28 Jul 2014 13:41:14 +0000 (28 15:41 +0200)
tree5bbf875c4a42ab76032c2f78a3a5f29d25a250a3
parent8b7b2f6600b89f612485d5c2aa3552bfd2eb57a1
parentb459972435f7a1b7243391bc91329e6b7b8b7b6a
Merge branch 'master' of orgmode.org:org-mode