Merge branch 'maint'
commit9dfccd3f2b8be21015827a8dd3e7e4806fad3a20
authorBastien Guerry <bzg@altern.org>
Fri, 26 Apr 2013 06:52:59 +0000 (26 08:52 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 26 Apr 2013 06:52:59 +0000 (26 08:52 +0200)
tree575c9941ede6474903fbdacdd800153eb5589b7c
parent267cbe518398d16cc2460067511dcd1b2bb07ef6
parent8d5198d6549b91ac5726b6d8dda652a268064c16
Merge branch 'maint'
lisp/org.el