Merge branch 'maint' of orgmode.org:org-mode into maint
commit1781a63304a2b716bd4c57e62506dbb6cd92535d
authorBastien Guerry <bzg@altern.org>
Thu, 17 Apr 2014 09:39:02 +0000 (17 11:39 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 17 Apr 2014 09:39:02 +0000 (17 11:39 +0200)
tree81dbc6c8b9c8b1f765abaf2503af2f7b666d21d8
parent17fb85b12c5070fa302b77092e3b78896bfd3e7b
parent9dac00129d5ab939bc535e9dc42b8243f1fc710f
Merge branch 'maint' of orgmode.org:org-mode into maint