Merge branch 'maint'
commit74168eea55e9a8da8bdc5c90d4466097a730f2e9
authorBastien Guerry <bzg@altern.org>
Tue, 20 May 2014 20:22:14 +0000 (20 22:22 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 20 May 2014 20:22:14 +0000 (20 22:22 +0200)
treea412e75dcdf24793b51cd56b26788d462d73ab6e
parentd8fdaf89aeecf40586f21ffae6ba8222bb0cf026
parent1811b37f4d01290112ac375e6d36c2a1030ad80d
Merge branch 'maint'
lisp/org-table.el
lisp/org.el