Merge branch 'maint'
commit94e501cab85254e91efc7d8038794ea143b50001
authorBastien Guerry <bzg@altern.org>
Fri, 1 Mar 2013 17:58:05 +0000 (1 18:58 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 1 Mar 2013 17:58:05 +0000 (1 18:58 +0100)
treeee05cedbc1a0dd8456856b7a146ea1ef8d4bddab
parent3b4a0b21c846a574baa63fc9e4002174538f89d7
parent7afbf870f2644b79a10cc99a2851953f79c9fedb
Merge branch 'maint'
lisp/org.el