Merge branch 'maint'
commitdaa35c0c686d212a1fc7c57fff546f16d3248ab2
authorBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 07:04:36 +0000 (8 08:04 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 07:04:36 +0000 (8 08:04 +0100)
tree932893ac760bc48f53469706b22f6aa5294877ab
parent45ed388387af9524d64d44f962b1e1f9b34cd47e
parent44d1a69eaba4df1c175b2c68d803c11ff77b6fa6
Merge branch 'maint'
lisp/org.el