]> 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: eec2ad4 94bd60c)
Merge remote-tracking branch 'stevee/nss-reworked'
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 17 Feb 2012 20:20:38 +0000 (21:20 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 17 Feb 2012 20:20:38 +0000 (21:20 +0100)

Trivial merge
Alex's tree of IPFire 3.x