Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Oct 2014 20:55:54 +0000 (22:55 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Oct 2014 20:55:54 +0000 (22:55 +0200)
commitdadfa436c9fbe800b1060e673bc17d96ef827874
treeee92d8e3638a891d6e609c48de4f1b340ae18c0b
parenta7006325c0bd39cb9f60c77e41cae81893205752
parent6c4319a1b890ceb10e2f087e945841aaefac32d6
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next