Merge branch 'master' of orgmode.org:org-mode
commit3abea320448e99afd88bf8cfa9583d71935cf188
authorBastien Guerry <bzg@altern.org>
Fri, 21 Mar 2014 08:56:50 +0000 (21 09:56 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 21 Mar 2014 08:56:50 +0000 (21 09:56 +0100)
tree238bfc3e4d6d5db8e24969d1da664f0266113146
parentec8f5dba026c25ef84ecfd34fd077c858ac4ad91
parent625397177d8f36a10a85fc15bd301fafaa7506c0
Merge branch 'master' of orgmode.org:org-mode