From: Michael Tremer Date: Tue, 2 Dec 2014 15:52:17 +0000 (+0100) Subject: Merge remote-tracking branch 'amarx/BUG10693' into next X-Git-Tag: v2.17-core89~83^2~54 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ae131ef235c11d9ff7419b9b84be7132bd25fb5;p=people%2Fpmueller%2Fipfire-2.x.git Merge remote-tracking branch 'amarx/BUG10693' into next --- 6ae131ef235c11d9ff7419b9b84be7132bd25fb5