Merge branch 'maint'
commitccbe3965b131663bb4944514a209f5b6a3b79d09
authorBastien Guerry <bzg@altern.org>
Tue, 7 Jan 2014 12:26:12 +0000 (7 13:26 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 7 Jan 2014 12:26:12 +0000 (7 13:26 +0100)
tree43ea76f0ad715144e3b3d3121cfa1d4bebc77571
parenta0d4c8d85da9415e2b8fdcb129c884ea8cbcb493
parent152712a7c87284c99ab4ad7e9d3e961d12943826
Merge branch 'maint'
lisp/org.el