Merge branch 'master' of orgmode.org:org-mode
commit82a9f66f467d2eeb06739bb97a83353b64a2aa6d
authorBastien Guerry <bzg@altern.org>
Wed, 3 Jul 2013 12:57:30 +0000 (3 14:57 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 3 Jul 2013 12:57:30 +0000 (3 14:57 +0200)
tree7d8c2301a51dca961dbbf6b5a48c50573543096c
parentf80e262967cbb6776105ceebd555aa2946a8ac33
parent733fb0713e6717c21bccaf0fb216ef2be0d6d97b
Merge branch 'master' of orgmode.org:org-mode