Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Mon, 14 Jan 2013 08:36:00 +0000 (09:36 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 14 Jan 2013 08:36:00 +0000 (09:36 +0100)
commitd06fa4fa16a4129f08a91f464a02383f08ded0d3
treed71b4374ff6904628909b4d8ef345ff653b88719
parent6d48cbc944a6b831c52d18bb6fcd55d19ba52c73
parent35204a83ddfb08d8f50d1ef1d1888d46de1c12c3
Merge branch 'master' of orgmode.org:org-mode