Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 29 Dec 2013 19:32:47 +0000 (20:32 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 29 Dec 2013 19:32:47 +0000 (20:32 +0100)
commit3d2c3affcd2992461fac5bba54dbff551eaafb72
tree6c42131919cc277065d1a7ae7465e621841297a3
parenta538898a469237653e1f0ada0238e7f4168a1991
parent63efc01c84a5f559858d0d46cb7c5a2212486567
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen