Merge branch 'master' of orgmode.org:org-mode
commit8694aa9352b1d9e778174a6111d8494c6713fb45
authorBastien Guerry <bzg@altern.org>
Tue, 14 Jan 2014 14:49:03 +0000 (14 15:49 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 14 Jan 2014 14:49:03 +0000 (14 15:49 +0100)
treef4788e9268ed40cbac05852dd2d2fb9a0728fb36
parent5cd6b30182b8a68594e72e577204f7b6148cd06d
parent46f6fe365589f67653235ad5dda160687a7c3bf9
Merge branch 'master' of orgmode.org:org-mode