Merge branch 'maint'
commit8b15ff9d07a5b927a0d9dbd85efb02ad5d7cc28d
authorBastien Guerry <bzg@altern.org>
Wed, 15 May 2013 14:31:54 +0000 (15 16:31 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 15 May 2013 14:31:54 +0000 (15 16:31 +0200)
treee91cce62e6e7b72260b235323e61127aa63ed840
parent1f7b3101429c46148cdf880e6f20db5aaed8fb76
parent838e421bf53c2ae41e6321d363fd0e8b85eb3c32
Merge branch 'maint'
lisp/org-table.el
lisp/org.el