Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Thu, 10 Jan 2013 13:37:58 +0000 (14:37 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 10 Jan 2013 13:37:58 +0000 (14:37 +0100)
commit535750d7052d8616873e3f9951a768a153486d5f
treed45bacda537865b608305b06717e841f24443614
parent67e83a10c8ba6a67e5f31c9ab70c488419a04cf2
parentb68103a34430819b16c74a54f9bb62978b209748
Merge branch 'master' of orgmode.org:org-mode