Merge tag 'samba-4.0.21' into v4-0-test
commit13ccfd24ffb7db7e5f3405b2050378085ba59ab9
authorKarolin Seeger <kseeger@samba.org>
Fri, 1 Aug 2014 11:14:43 +0000 (1 13:14 +0200)
committerKarolin Seeger <kseeger@samba.org>
Fri, 1 Aug 2014 11:14:43 +0000 (1 13:14 +0200)
treeb41dbb3850e2b7ee4189a78610a5dc84ee141b8a
parent00fe8eb4c86c4c1c4a2fbedb07e6813cb9002487
parent2ec2bd60863a80367be9c8b11e080ac718056796
Merge tag 'samba-4.0.21' into v4-0-test

samba: tag release samba-4.0.21