Merge branch 'maint'
commitf531d06f804ba543147e0e5fd9260cd8368d5997
authorBastien Guerry <bzg@altern.org>
Fri, 3 Jan 2014 10:16:30 +0000 (3 11:16 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 3 Jan 2014 10:16:30 +0000 (3 11:16 +0100)
tree489e0824da0c36d23a54addde0a0f2e1848dc195
parentd9b520586dd04ddab02608659b8211d40e42f069
parentf21150f1853180f63741083e427ef4e6bec1ea52
Merge branch 'maint'
lisp/org.el