From: Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
Date: Mon, 13 Jun 2016 09:26:25 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into function_pointers2
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=875e00fd6e66571a8f0aff122550170c02ce8133;p=rust.git

Merge remote-tracking branch 'origin/master' into function_pointers2
---

875e00fd6e66571a8f0aff122550170c02ce8133