Merge branch 'maint'
commit4014947f31b5603790e6eb82a06673d535acacf4
authorBastien Guerry <bzg@altern.org>
Thu, 12 Jun 2014 10:05:00 +0000 (12 12:05 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 12 Jun 2014 10:05:00 +0000 (12 12:05 +0200)
tree18aad307d5781b7fc0cef1b40391c5f993ea4f4b
parent39d0433637b1a3b4d630221bd1b338b0337a7faf
parent30220ffcdcef45c0237f80a2347d4da19877f64a
Merge branch 'maint'
lisp/org-agenda.el
lisp/org-table.el
lisp/org.el