Merge branch 'maint'
commit72ad5257fcd40d899eae980a987733fda993c916
authorBastien Guerry <bzg@altern.org>
Wed, 29 Jan 2014 13:58:14 +0000 (29 14:58 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 29 Jan 2014 13:58:14 +0000 (29 14:58 +0100)
tree6085b41af69632aecd75f357b189a093efe17a2d
parent524242fc4d348e832066cad65e3e0bd0beccf196
parent33a0a198e342dd49f9beb3b507dd994447443dff
Merge branch 'maint'
lisp/org.el