Merge branch 'maint'
commit460c4d4ed052329d349ead9476b21d19ab3a0692
authorBastien Guerry <bzg@altern.org>
Sun, 30 Dec 2012 00:21:32 +0000 (30 01:21 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 30 Dec 2012 00:21:32 +0000 (30 01:21 +0100)
tree9664b73f21f81691ebdde83dcca7277bc36b4410
parentb5f93f8fe3161a333a7b1f86c40af2900f35c797
parent14c3635a0dc532401ba3aa9a5b5c2650bc562b40
Merge branch 'maint'
lisp/org.el