From: Jan Paul Tuecking <earl@ipfire.org>
Date: Fri, 6 Sep 2013 19:57:51 +0000 (+0200)
Subject: Merge branch 'master' into tor
X-Git-Tag: v2.13-core73~19^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7c69924fc9f4af89567024ad51b87323c1a6bf3;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'master' into tor

Conflicts:
	langs/de/cgi-bin/de.pl
	lfs/tor
---

e7c69924fc9f4af89567024ad51b87323c1a6bf3