Merge branch 'master' of orgmode.org:org-mode
commita265b15f1250afa9f53020f1c354efbe199512e7
authorBastien Guerry <bzg@altern.org>
Thu, 12 Jul 2012 12:05:01 +0000 (12 14:05 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 12 Jul 2012 12:05:01 +0000 (12 14:05 +0200)
tree41b58103210a9d234a669a98ee7e4c0db3e0c34c
parent3528fc6b423c43b9e42e2622936dacad9914dfd7
parent1216df61cc4dcc60170caace9b45e2b8c8f2f9da
Merge branch 'master' of orgmode.org:org-mode