]> 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: bc18b4d f3013cb)
Merge branch 'updates2'
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 12 May 2009 15:13:57 +0000 (17:13 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 12 May 2009 15:13:57 +0000 (17:13 +0200)
1  2 
lfs/pam patch | diff1 | diff2 | blob | history

diff --cc lfs/pam
Simple merge
IPFire 3.x development tree