Merge tag 'samba-4.0.4' into v4-0-test
commit730b822549fd5ec96322e1b62af24476eeb92b76
authorKarolin Seeger <kseeger@samba.org>
Wed, 20 Mar 2013 11:19:35 +0000 (20 12:19 +0100)
committerKarolin Seeger <kseeger@samba.org>
Wed, 20 Mar 2013 11:19:35 +0000 (20 12:19 +0100)
tree18ad279fedbba6a05e9b358e6ef6ffa263a4fc20
parente5288a2d228a68483fd1bc0dc679b44b327dc0fe
parentb3413711e12c1357cb63cdbdaa250786f9119032
Merge tag 'samba-4.0.4' into v4-0-test

samba: tag release samba-4.0.4
source3/param/loadparm.c