From: Bastien Guerry <bzg@altern.org>
Date: Thu, 31 Jan 2013 11:06:39 +0000 (+0100)
Subject: Merge branch 'master-new-features'
X-Git-Tag: release_8.0-pre~470
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/be1169fac7ad3a8b7b2ed1c38a5d8a0fe4944f7e

Merge branch 'master-new-features'
---

be1169fac7ad3a8b7b2ed1c38a5d8a0fe4944f7e