Merge branch 'maint'
commitfb6170ec9cc84045bdd58b748d6bae72ea82f23e
authorBastien Guerry <bzg@altern.org>
Wed, 24 Apr 2013 13:43:47 +0000 (24 15:43 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 24 Apr 2013 13:43:47 +0000 (24 15:43 +0200)
tree56bdedd0173e710d9cf5282cb2a7a6d41b1ee828
parente87dc9df1a2e2ded681646dfa4f17a0dd4d1f31a
parent778c812535c3d4b90fe52b2d3470e8290ff6b904
Merge branch 'maint'
lisp/org.el