]> 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: ceaa40b 1f5d577)
Merge remote-tracking branch 'stevee/sssd'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 23 Mar 2013 21:19:31 +0000 (22:19 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 23 Mar 2013 21:19:31 +0000 (22:19 +0100)

Trivial merge
IPFire 3.x development tree