From: Simon McVittie <smcv@debian.org>
Date: Fri, 12 Sep 2014 20:45:04 +0000 (+0100)
Subject: Merge branch 'ready/perf'
X-Git-Tag: 3.20140916~46
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/252804628d7297f756f8587d78a07a61fc00846e?hp=252804628d7297f756f8587d78a07a61fc00846e

Merge branch 'ready/perf'
---