Merge branch 'maint'
commit98de33a9acfd59f0c64020db998adb0fe8129551
authorBastien Guerry <bzg@altern.org>
Thu, 30 Jan 2014 11:21:51 +0000 (30 12:21 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 30 Jan 2014 11:21:51 +0000 (30 12:21 +0100)
tree87d0d268357cbff10f576619964552ba9a95f410
parentde087d0bbe994299e7c9e1209de2da9b4d587f7e
parentf3ed0f7c6c85487439511cfddaee6d32ca70b108
Merge branch 'maint'
lisp/org.el