Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 22:44:59 +0000 (23:44 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 22:44:59 +0000 (23:44 +0100)
commit94ea6bca087e92feae6d97be6b2c6072c93c0fd8
tree06c1d675677f4bca87d58b8485c9c799df0ecfe5
parent832b6e66ea453a01dbb7b2b4f49513e9cb782a0f
parente53f22c615d217c73ccc9dc23bd39516d49482f5
Merge branch 'maint'
lisp/org.el