]> 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: 35448a5 ee877de)
Merge remote-tracking branch 'maniacikarus/samba'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 29 Jan 2012 10:54:13 +0000 (11:54 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 29 Jan 2012 10:54:13 +0000 (11:54 +0100)
1  2 
samba/samba.nm patch | diff1 | diff2 | blob | history

diff --cc samba/samba.nm
Simple merge
Michael's tree of IPFire 3.x.