]> 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 (from: b04a341)
Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 11 Apr 2014 13:18:50 +0000 (15:18 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 11 Apr 2014 13:18:50 +0000 (15:18 +0200)
Conflicts:
doc/language_issues.tr


No differences found
Timo's tree of IPFire 2.x