Merge remote-tracking branch 'origin/seventeen' into seventeen
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 16 Nov 2014 10:38:45 +0000 (11:38 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 16 Nov 2014 10:38:45 +0000 (11:38 +0100)
commitf9921891f4dc3bc2f9be80d2871ce6f766a38e23
tree5c08128008f68454ef1a444d22a93b2633d53df0
parentc5a5b13e8ed808c726b3bb4142fa3dd49ad9d4a8
parentda4529ae5110d3e33d0f15338da5288728352d39
Merge remote-tracking branch 'origin/seventeen' into seventeen