]> 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: fddeee6 3e82218)
Merge remote-tracking branch 'stevee/gnutls'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 15 Oct 2011 17:18:53 +0000 (19:18 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 15 Oct 2011 17:18:53 +0000 (19:18 +0200)

Trivial merge
Alex's tree of IPFire 3.x