[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  d00c5cc Merge remote branch 'origin/v4-0-test'
       via  0eded28 Release alpha14.
      from  bf0d5d0 Typo fix in KDC parameters.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d00c5cc1ec75345dbddceecc0d168ca909d63c18
Merge: bf0d5d04ab3900361d0b4762de8d51571a4c5176 0eded28c2371adb356fc6c48185455fd6257c0c5
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Dec 24 12:10:43 2010 +0100

    Merge remote branch 'origin/v4-0-test'
    
    'git merge -s ours origin/v4-0-test' to get the release tag into master.
    
    metze

-----------------------------------------------------------------------

Summary of changes:


Changeset truncated at 500 lines:



-- 
Samba Shared Repository