Merge branch 'master' of orgmode.org:org-mode
commit5adb7638fe5ab325ba5483cd22df050cbdb24dab
authorBastien Guerry <bzg@altern.org>
Tue, 10 Apr 2012 22:44:05 +0000 (11 00:44 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 10 Apr 2012 22:44:05 +0000 (11 00:44 +0200)
tree6c0d5b70af524be6f48899a713bc55bcd513ec19
parentc836b050848381a61372d9dde090b7fdab1fa2d7
parentc8294348efcd4e2d2163ec8d66969b3b1d52e8f4
Merge branch 'master' of orgmode.org:org-mode