Merge branch 'master' of orgmode.org:org-mode
commit93ed2e1434e5bb4ae0662ae57c85cf5bdae09abf
authorBastien Guerry <bzg@altern.org>
Wed, 13 Feb 2013 10:11:22 +0000 (13 11:11 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 13 Feb 2013 10:11:22 +0000 (13 11:11 +0100)
tree849e85cd03cadae7ed4bc7077b9509443aae04ac
parent83b453dea4ab165a85ffaff47212c51e35d72c46
parentd6f69f58aa32b104068aee9913200daa30dfcf99
Merge branch 'master' of orgmode.org:org-mode