git.ipfire.org Git - people/ms/ipfire-3.x.git/commit

author	Michael Tremer <michael.tremer@ipfire.org>
	Mon, 31 Oct 2011 12:30:20 +0000 (13:30 +0100)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Mon, 31 Oct 2011 12:30:20 +0000 (13:30 +0100)
commit	c1fa1b26fdbd4e471e6a717a3c2cf014ce5cbcee
tree	dc3fe3fef482718d4a16a55056ac86db66918000	tree \| snapshot
parent	d30f48f32d74e1a89c882719dd5a299e47ca3c75	commit \| diff
parent	c4ea8da6ecb2453803c43991aee9da8692843fd3	commit \| diff

Merge remote-tracking branch 'maniacikarus/samba'

Conflicts:
samba/samba.nm