Merge branch 'master' of orgmode.org:org-mode
commit817de8c55c4f4ea95b96356252886fcca977474d
authorBastien Guerry <bzg@altern.org>
Wed, 26 Sep 2012 21:44:44 +0000 (26 23:44 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 26 Sep 2012 21:44:44 +0000 (26 23:44 +0200)
treee092706b93becd181cba4c561e3a51b1ca96960d
parent099254486405d85dbb5beee53b80c20c4ab5331e
parentfa8d7f3d310e12f6ee32498ad6b054305ce925cf
Merge branch 'master' of orgmode.org:org-mode