Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 1 Jun 2015 13:59:33 +0000 (15:59 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 1 Jun 2015 13:59:33 +0000 (15:59 +0200)
commita421b8038b927529a4ed08c13539f74f66c18f9e
tree1f6a617fb9217e27b7c58039ced083b20c7c5865
parent91fc30309fcc929ae3b4b88f6cac67e1214e73a9
parente97d4c98963477b5247005d33acd9d4b5fe1ca8e
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next