]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commit
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)
commite7c69924fc9f4af89567024ad51b87323c1a6bf3
treef283c96dea2871955d116a0ea54a1126ae26d96a
parentcd4a82251b83ff60540650902925c39550d86e13
parentcd010e09a321ab562ff45da1b27e521da160c71f
Merge branch 'master' into tor

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