]> 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: 4d4a345 1432fd3)
Merge remote-tracking branch 'maniacikarus/samba'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 2 May 2012 13:30:50 +0000 (15:30 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 2 May 2012 13:30:50 +0000 (15:30 +0200)

Trivial merge
IPFire 3.x development tree