From: Bastien Guerry <bzg@altern.org>
Date: Mon, 25 Mar 2013 14:54:42 +0000 (+0100)
Subject: Merge branch 'master' of orgmode.org:org-mode
X-Git-Tag: release_8.0~3^2~292
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/e800105122dacedcd818250dca35f51720ff5465

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

e800105122dacedcd818250dca35f51720ff5465