Merge branch 'master' of git://git.samba.org/samba
authorLars Müller <lars@samba.org>
Mon, 18 Jan 2010 10:52:33 +0000 (11:52 +0100)
committerLars Müller <lars@samba.org>
Mon, 18 Jan 2010 10:52:33 +0000 (11:52 +0100)
commit286a27bd1e0771360bd82077253ccf28149bb780
treeecdfbb1f3ea5f0d871cf32e04cf9efa9dcb1197e
parent9e318129e0285e8fecf905187f2ca94a58b60316
parent46842a68618b4c9faba25580e68a286b97f9337e
Merge branch 'master' of git://git.samba.org/samba