Merge branch 'maint'
commitaab08b5e36f42deef9a8c93162820ad04c254d76
authorBastien Guerry <bzg@altern.org>
Thu, 4 Jul 2013 20:11:57 +0000 (4 22:11 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 4 Jul 2013 20:11:57 +0000 (4 22:11 +0200)
tree6d00d2df4430dbbcdf92cc8bf94ffe6631f8b209
parent9bc8ed37318d3ffc8271596d531db4e0bd20b0eb
parenteeb13239335cd4e34b9c81648207803091d38a16
Merge branch 'maint'
lisp/org.el