Merge remote-tracking branch 'mfischer/newt' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 May 2015 12:27:02 +0000 (14:27 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 May 2015 12:27:02 +0000 (14:27 +0200)
commit188c4ba444b31343c29b311fcb2d0c0ba84e80ee
tree9f15ff6a8c1df072495cb0b4d9fbc72fdcceb3a0
parentbee99d28c9cf28d167beb416cdcfb9e56b542902
parentbbc7cc3189f7ae5f4a645211951e42f6e761f244
Merge remote-tracking branch 'mfischer/newt' into next