Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen-layout
authorAlexander Marx <amarx@ipfire.org>
Thu, 9 Jan 2014 09:15:29 +0000 (10:15 +0100)
committerAlexander Marx <amarx@ipfire.org>
Thu, 9 Jan 2014 09:15:29 +0000 (10:15 +0100)
commit943a96faed4fb515259c18d04b330ba622490b7b
treecd3ca6a0683d368a16d5486b00c32afe754664f8
parent4bf6a597fead7f5bf3d868593be4d9e366a1f3e8
parent9b574b13de88735968287db83bf1936087f9e59a
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen-layout
langs/de/cgi-bin/de.pl