Merge branch 'maint'
commit07347025ee204b76d372a5cd62a37d5a5feb0472
authorBastien Guerry <bzg@altern.org>
Fri, 14 Mar 2014 08:59:38 +0000 (14 09:59 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 14 Mar 2014 08:59:38 +0000 (14 09:59 +0100)
tree59a0bd7ea9e0d31e9541d7013788d2d2aa14bead
parentc1d5a0ae0504ebeb0099bb18120525da4ccdf919
parent49a9c2b2132cf22e30939bef6355b7aacf699f68
Merge branch 'maint'
lisp/org-src.el