]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
projects / people / ms / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28d2dc2 0db4896)
Merge remote-tracking branch 'stevee/authconfig'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Jun 2011 12:18:35 +0000 (14:18 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Jun 2011 12:18:35 +0000 (14:18 +0200)

Trivial merge
Michael's tree of IPFire 3.x.