Merge remote-tracking branch 'mfischer/slang' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 May 2015 12:27:32 +0000 (14:27 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 May 2015 12:27:32 +0000 (14:27 +0200)
commitf042e1d398bf4bade415773fe5849791f864444c
treeee9a9263bc6fb8db7eb61f56292c5e805283cbbd
parent1f8dddccb6f3f8f8b05074d8375708af9ddfb3eb
parentc199aa774cccd349713c6c917cf5e8f209a713c5
Merge remote-tracking branch 'mfischer/slang' into next