Merge branch 'master' into tor
authorJan Paul Tuecking <earl@ipfire.org>
Fri, 6 Sep 2013 19:57:51 +0000 (21:57 +0200)
committerJan Paul Tuecking <earl@ipfire.org>
Fri, 6 Sep 2013 19:57:51 +0000 (21:57 +0200)
Conflicts:
langs/de/cgi-bin/de.pl
lfs/tor


Trivial merge