]> 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 | combined (merge: 892c6da 973bcb0)
Merge branch 'sudo-without-pam' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 26 May 2014 21:46:20 +0000 (23:46 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 26 May 2014 21:46:20 +0000 (23:46 +0200)

Trivial merge
Timo's tree of IPFire 2.x