]> 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: d9e45c8 da48125)
Merge remote-tracking branch 'maniacikarus/samba'
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Oct 2011 10:42:05 +0000 (12:42 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Oct 2011 10:42:05 +0000 (12:42 +0200)

Trivial merge
IPFire 3.x development tree