Merge branch 'master' of orgmode.org:org-mode
commit307cc6d6aa7c3d1d44a7cc352b3c8ea5a0895412
authorDavid Arroyo Menéndez <davidam@gmail.com>
Wed, 15 Oct 2014 13:08:54 +0000 (15 15:08 +0200)
committerDavid Arroyo Menéndez <davidam@gmail.com>
Wed, 15 Oct 2014 13:08:54 +0000 (15 15:08 +0200)
tree4b59b36a138372efe1c479c75360fc1bb70d9df5
parent03c0ab007954be7ecd22dba11575c66795b9f905
parent5963b0345513398fd553c4fd5d11832243b6e49a
Merge branch 'master' of orgmode.org:org-mode