Merge branch 'maint'
commit38051ce48179831bc971c83be04f59fe56d94e51
authorBastien Guerry <bzg@altern.org>
Wed, 24 Apr 2013 14:22:21 +0000 (24 16:22 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 24 Apr 2013 14:22:21 +0000 (24 16:22 +0200)
tree8b8e637da63b15b895825b9b1116b97fddb5fbcc
parentfb6170ec9cc84045bdd58b748d6bae72ea82f23e
parent0e4a4c452e91971645a58851d7522322a9a83fd7
Merge branch 'maint'
lisp/org.el