Merge branch 'maint'
commit5c2dd988a502f71a35b8bdcd77e03883fffc47a4
authorBastien Guerry <bzg@altern.org>
Fri, 4 Jan 2013 17:15:56 +0000 (4 18:15 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 4 Jan 2013 17:15:56 +0000 (4 18:15 +0100)
treea9624fa1edfcd37caa7dabe9d58c9f693ace9a7d
parent576f43b7434301460a648436ed92d4a4c2b01f8b
parent6a0c650dd2c2ba9f922663750e066fb47e2b2111
Merge branch 'maint'
lisp/org.el