Merge branch 'maint'
commitce8081f7c113f91338dbb5d8ac7479754fa233aa
authorBastien Guerry <bzg@altern.org>
Sat, 1 Mar 2014 20:48:11 +0000 (1 21:48 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 1 Mar 2014 20:48:11 +0000 (1 21:48 +0100)
tree9e1c846720b27185cafa116cce1a787daff77a26
parent971dc41ce83b2e95f522e2a51f7fe497067724e2
parentdd810b609b3554d38ccec61cc101a21813b269a2
Merge branch 'maint'
lisp/org.el