Merge commit 'samba-4.0.2' into v4-0-test
authorKarolin Seeger <kseeger@samba.org>
Wed, 30 Jan 2013 10:54:45 +0000 (11:54 +0100)
committerKarolin Seeger <kseeger@samba.org>
Wed, 30 Jan 2013 10:54:45 +0000 (11:54 +0100)
commitbaacf3e951628be656c2a624f683db53a6bbfdca
tree44b957c25e72e9b35c6779dee48d26f3e247470c
parent7ba52a12bb930cfaddc3092cac291e4f7d503c05
parent1c2abd4cffe63bdc95449d97c9e823e96de04a8e
Merge commit 'samba-4.0.2' into v4-0-test