Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 11 Jan 2014 13:20:16 +0000 (14:20 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 11 Jan 2014 13:20:16 +0000 (14:20 +0100)
commit621e8d148b27125db48f50f0b11bd75454d909bb
tree476c91b459e0a69bfd8b7b508c53a42d6aa4c940
parent2d0e29fcfb429f057901b2799fc88bb30a3be2f0
parente9e998099e2b82dd84062a0d2d9ce24bdc7a294c
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen