Merge branch 'maint'
commitb0174feaa1286fd968e5b481fd424eebd5416845
authorBastien Guerry <bzg@altern.org>
Wed, 3 Jul 2013 13:06:39 +0000 (3 15:06 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 3 Jul 2013 13:06:39 +0000 (3 15:06 +0200)
tree15a1dacdf8e856291eed13c485809729751a3ce3
parent82a9f66f467d2eeb06739bb97a83353b64a2aa6d
parentf12976440a19d42db8c529d796b7650ca4578a81
Merge branch 'maint'
lisp/org.el