Merge remote-tracking branch 'mfischer/python' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 May 2015 12:30:27 +0000 (14:30 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 May 2015 12:30:27 +0000 (14:30 +0200)
1  2 
langs/de/cgi-bin/de.pl

Simple merge