Merge branch 'maint'
commit6fd066fb183fced8a8410d49a108420988e63321
authorBastien Guerry <bzg@altern.org>
Mon, 31 Dec 2012 10:07:06 +0000 (31 11:07 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 31 Dec 2012 10:07:06 +0000 (31 11:07 +0100)
tree5fced8761698ee0c8713544f89f429d182f282b0
parent6a758e26fff9f0f533eda18677b0297717f57087
parent61993bc4bf86769ef37573c5b7db40feebb34d53
Merge branch 'maint'
lisp/org.el