Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Jun 2015 19:56:58 +0000 (21:56 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Jun 2015 19:56:58 +0000 (21:56 +0200)
commit6c7290acb29d6a9c7d455406a7bf0dafd4897b58
treefee71d6d01394c26250c78aad5d1f37c414ea286
parent3560f497c090dafefc1d2d5b89ad7069a58c01f3
parent3d82ea0ab1b313506bb6daeabedc8c0e760fc7e1
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next