From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 28 Jan 2015 21:42:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'ummeegge/mtr'
X-Git-Tag: v2.17-core87~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d3eb05e5c4c172153f60f924b2467dc7cc301f1;p=people%2Fstevee%2Fipfire-2.x.git

Merge remote-tracking branch 'ummeegge/mtr'
---

6d3eb05e5c4c172153f60f924b2467dc7cc301f1