]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: cd4a822 cd010e0)
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
Timo's tree of IPFire 2.x