Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 14 Oct 2013 12:56:20 +0000 (14:56 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 14 Oct 2013 12:56:20 +0000 (14:56 +0200)
commitfa9ef0a616a8c5f536c9f6f5d9a10a088bea5488
tree02925788d4559fb2ee993fd2e5eb6c031e65ad34
parent11bc3c64204db4115ccb7c086faeb8ff233e45ba
parent0b7f6aa4d9d0f6c17d668620000c4496eb96e34c
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen