Merge remote-tracking branch 'mfischer/mc' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 23:02:49 +0000 (00:02 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 23:02:49 +0000 (00:02 +0100)

Trivial merge