]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c59cafc b4725dd)
Merge remote-tracking branch 'stevee/nfs-krb5-support'
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 28 Jan 2013 13:18:04 +0000 (14:18 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 28 Jan 2013 13:18:04 +0000 (14:18 +0100)

Trivial merge
IPFire 3.x development tree