Merge branch 'master' of orgmode.org:org-mode
commit7faea08c7a2a03064273f93fe2f3cdf4f43e09da
authorBastien Guerry <bzg@altern.org>
Fri, 22 Feb 2013 13:38:42 +0000 (22 14:38 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 22 Feb 2013 13:38:42 +0000 (22 14:38 +0100)
treed0b6809ed1448c0b9ed5277d36755bf53416bc35
parent3d28682874dce394089185c3786161fe196ee1a0
parent6c565ec5331a674ba96edf6d79695a9b6262213a
Merge branch 'master' of orgmode.org:org-mode