]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
projects / people / amarx / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35aa2f4 0a8170a)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 20 Apr 2012 09:56:11 +0000 (11:56 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 20 Apr 2012 09:56:11 +0000 (11:56 +0200)

Trivial merge
Alex's tree of IPFire 3.x