Merge branch 'maint'
commit64aae2fd2929a86d56f4eb01e50270d3f64e58be
authorBastien Guerry <bzg@altern.org>
Sat, 23 Feb 2013 13:42:45 +0000 (23 14:42 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 23 Feb 2013 13:42:45 +0000 (23 14:42 +0100)
tree82ad92fa3e987be1c572a641cea6749bde40ef15
parentb2e38cb030bc8c2c7927ed6a2226bb99b2e3fc17
parentb6b509bfd458cace38b9cb7e17b18d3f146b0c1a
Merge branch 'maint'
lisp/org.el