Merge remote-tracking branch 'ummeegge/langs' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 Aug 2013 11:25:34 +0000 (13:25 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 Aug 2013 11:25:34 +0000 (13:25 +0200)
1  2 
langs/en/cgi-bin/en.pl

Simple merge