Merge branch 'maint'
commit2b980a4257ff9f8a6f7da7598bbdf19697817333
authorAchim Gratz <Stromeko@Stromeko.DE>
Sun, 1 Jun 2014 12:23:18 +0000 (1 14:23 +0200)
committerAchim Gratz <Stromeko@Stromeko.DE>
Sun, 1 Jun 2014 12:23:18 +0000 (1 14:23 +0200)
treeaa8cbc7714cf8bf78cd3ac5db8ad610e300a110d
parent8e4b52235c8f31f6d254b7dd9f22bb615c9e912c
parent814188ac7e25c500433c13d8696af47d62f0de23
Merge branch 'maint'
lisp/org-footnote.el