From: Christian Egli <christian.egli@alumni.ethz.ch>
Date: Wed, 24 Apr 2013 08:21:28 +0000 (+0200)
Subject: Merge branch 'master' of orgmode.org:org-mode
X-Git-Tag: release_8.1~288^2
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/aed8b7176fa4cb067b15d4facf9c6280f4807a95

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

aed8b7176fa4cb067b15d4facf9c6280f4807a95