Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 6 Jan 2014 07:56:31 +0000 (08:56 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 6 Jan 2014 07:56:31 +0000 (08:56 +0100)
commitf4b373993fb60809901e7c45d690f569b0d8867c
tree0020562ec1254d22bd86a1365c2e18ec53aca14d
parent75474c3c493c3f2f4a4ab793910557fffc4182d3
parent9027a25d92afbbb4486c17deac66b4c439e80520
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen