Merge branch 'master' of orgmode.org:org-mode
commit0678e0e3593cc21b385802b44272cc9fa0a2ebcd
authorBastien Guerry <bzg@altern.org>
Sat, 28 Apr 2012 21:35:01 +0000 (28 23:35 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 28 Apr 2012 21:35:01 +0000 (28 23:35 +0200)
treee5638d408172951d99737bf9dc927303f2ac5944
parentd7dfe9fd695ee94dc8cb0dfb5295bf55338c57f7
parentf9d4069033e90a538664ee443501e4ef2cd618b7
Merge branch 'master' of orgmode.org:org-mode