Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 7 Jan 2014 19:22:53 +0000 (20:22 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 7 Jan 2014 19:22:53 +0000 (20:22 +0100)
commitbf7746ef83f0afeb6764b23336783e4a0e221eff
tree6d845f534ab30713a43c146ca899f379cc05aeeb
parent26922c33eb91951c79c5b6a5e959a5adbf20bc9b
parentf5e106c42ab1fcb54f2d4c2605dfbe213b5b792a
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen