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)
commitc0ce138ad29387a8e89ecef81c3ef6db6b047c85
tree45951d6a20c7b955a2eda90764dcb2f27f411784
parent9eb8db8046745c252395ddb9fdbbe755b8e39aae
parentdc1d8fe731abec4a99be141e08054cc6647de745
Merge remote-tracking branch 'mfischer/mc' into next