Merge branch 'maint'
commit5590531007dc425a5e1cce0375add19860d21672
authorBastien Guerry <bzg@altern.org>
Wed, 19 Mar 2014 15:13:43 +0000 (19 16:13 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 19 Mar 2014 15:13:43 +0000 (19 16:13 +0100)
treee6c482ca3c28c26919b549a552de4f18ff12e671
parent2cd15b9c7c0f459783f209b360c0bb871ff47c4c
parent49da67d351b55c9325e2f587928d28631aa2755d
Merge branch 'maint'
lisp/org.el