Merge branch 'maint'
commit3ce5b3bb22be202a82213e4b4bbed4b134a0d53e
authorBastien Guerry <bzg@altern.org>
Thu, 16 May 2013 15:07:32 +0000 (16 17:07 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 16 May 2013 15:07:32 +0000 (16 17:07 +0200)
tree8bd715b55c7bff749bbd05315b37bd48dc4a5a8b
parentab3f45cece895aca0a934dec3004119c7ce0da0a
parent37d526e06e43f1e14fb7222f8d5ec9fdcd6df9f2
Merge branch 'maint'
lisp/org.el