Merge branch 'maint'
commit5cd6b30182b8a68594e72e577204f7b6148cd06d
authorBastien Guerry <bzg@altern.org>
Tue, 14 Jan 2014 11:39:01 +0000 (14 12:39 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 14 Jan 2014 11:39:01 +0000 (14 12:39 +0100)
tree1cdd9f7c91cb290d7e6f3eb8d642b0973f778689
parentdd412491b36f36cf506e7b75f53adb7e3c6a94d3
parent4a9820067a3fdb78c977a5077771b86d548764a4
Merge branch 'maint'
lisp/org.el