Merge branch 'maint'
commit60502a0217a156d64dc9b301561db4129e7bf1fd
authorBastien Guerry <bzg@altern.org>
Wed, 30 Apr 2014 08:44:20 +0000 (30 10:44 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 30 Apr 2014 08:44:20 +0000 (30 10:44 +0200)
tree911a903ad5e9faac520ca1223a3ba4e863147545
parent3034f2895afadb5222e71bf26f68f6c8f2d13ce0
parent0ca4092d72ca7cba44904135e485dfa38eb03561
Merge branch 'maint'
lisp/org.el