Merge branch 'maint'
commite87dc9df1a2e2ded681646dfa4f17a0dd4d1f31a
authorBastien Guerry <bzg@altern.org>
Wed, 24 Apr 2013 09:36:47 +0000 (24 11:36 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 24 Apr 2013 09:36:47 +0000 (24 11:36 +0200)
tree899a98514fe82a792ff21be77050a2ac3b75a541
parent6e4ce7dc231c8615d33fb826e266ca4aaed44366
parent253b65c0912448baeadb90d7fb2aee9a3d03ba9f
Merge branch 'maint'
lisp/org.el