Merge branch 'maint'
commitcf98ded2d4e5bc654f305ec4214868730e14cf89
authorBastien Guerry <bzg@altern.org>
Thu, 6 Sep 2012 17:41:51 +0000 (6 19:41 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 6 Sep 2012 17:41:51 +0000 (6 19:41 +0200)
tree22eaa25cb993ad9283e8a959d4f4ee3ede70acc0
parent0a6165a5551549f9a1925f8766c0f162b091c408
parent12f46c9d00b98dd442697398f65a0a925fba5073
Merge branch 'maint'
lisp/org.el