Merge branch 'maint'
commit27a978577f585c07306c0ec6935ba5c73328e9d3
authorBastien Guerry <bzg@altern.org>
Thu, 6 Feb 2014 11:37:50 +0000 (6 12:37 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 6 Feb 2014 11:37:50 +0000 (6 12:37 +0100)
treedb4c42136fbf8fabd841fec4d4bca04e0f81948e
parentf05d148e61e7b0c96dde54864386cc400ca4bd28
parent016a394de730537b12bc9433be912a20eac73df1
Merge branch 'maint'
lisp/org.el