Merge branch 'maint'
commit0cf1be58f5614c839a88cf9561400e62155ea8fb
authorBastien Guerry <bzg@altern.org>
Wed, 21 May 2014 02:02:49 +0000 (21 04:02 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 21 May 2014 02:02:49 +0000 (21 04:02 +0200)
tree6ef3a9ca148f63ee1b0f59dc4bbab925f98e3cf7
parentc264904b123793d94cce07d0a67c7e8eb86145f8
parentd438fbfb1bff081070b4ce29e1c05912abd21d82
Merge branch 'maint'
lisp/org.el