From: Bastien Guerry <bzg@altern.org>
Date: Tue, 26 Mar 2013 15:00:56 +0000 (+0100)
Subject: Merge branch 'master' of orgmode.org:org-mode
X-Git-Tag: release_8.0~3^2~279
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/aa7b1e0b397859438f64889510a39293f10bcdf0

Merge branch 'master' of orgmode.org:org-mode
---

aa7b1e0b397859438f64889510a39293f10bcdf0