Merge branch 'maint'
commitf15a83ab9f47fe43010576929013d3fc115c4905
authorNick Dokos <ndokos@gmail.com>
Thu, 21 Aug 2014 02:18:07 +0000 (20 22:18 -0400)
committerNick Dokos <ndokos@gmail.com>
Thu, 21 Aug 2014 02:18:07 +0000 (20 22:18 -0400)
treeedbfd235462f02dafa8330afa72d824e6a20002a
parent64821bd967828ed33463987a60d947157c86a30c
parent50da53de5153d03850bab6ca0327018f4fb037c1
Merge branch 'maint'

Revert commit 79873390edd26a44cefc2050c7af470a7ed8fd07.
The fix was wrong and gave rise to a different problem - see

    http://thread.gmane.org/gmane.emacs.orgmode/89945
lisp/org-table.el