Merge branch 'maint'
commitdfa317b6f3211f0153814e87e418e7a1d956023a
authorBastien Guerry <bzg@altern.org>
Thu, 8 Mar 2012 13:08:38 +0000 (8 14:08 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 8 Mar 2012 13:08:38 +0000 (8 14:08 +0100)
tree56ff482472cb31232e1ebeae4b98a492d8483990
parentb879590f3ba285198344f7cded47b96fd576df29
parente78cb895ca969438603300e566a4dfe702d44776
Merge branch 'maint'
lisp/org.el