Merge branch 'hotfix'
commit1a8a39d2df2baace63f33c39cf818387e0466b0b
authorBastien Guerry <bzg@altern.org>
Mon, 9 Apr 2012 14:57:19 +0000 (9 16:57 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 9 Apr 2012 14:57:19 +0000 (9 16:57 +0200)
tree81a743f2100a39959e71890422d3aa9fc2a4fd55
parent76503ed1b4114e9e0142e85df86261d1146b37a3
parent275905ed8d5492c3b570dc6f8482d570baa1ef82
Merge branch 'hotfix'
lisp/org.el