Merge branch 'master' of orgmode.org:org-mode
commitb7a7a13ad1e66aac3b64f2ccf3ac4d25652e7876
authorBastien Guerry <bzg@altern.org>
Fri, 27 Jul 2012 15:29:39 +0000 (27 17:29 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 27 Jul 2012 15:29:39 +0000 (27 17:29 +0200)
tree3e97c30302782fb7f37329aa24345ab5304aacf2
parentb86a6f6f34f6b98674e9abb7ae8d70cd3f3406c7
parent5057ae0fc2c0d551a83d3c3e9bd621b751db9f09
Merge branch 'master' of orgmode.org:org-mode