Merge remote branch 'origin/v4-0-test'
authorStefan Metzmacher <metze@samba.org>
Fri, 24 Dec 2010 11:10:43 +0000 (12:10 +0100)
committerStefan Metzmacher <metze@samba.org>
Fri, 24 Dec 2010 11:11:08 +0000 (12:11 +0100)
commitd00c5cc1ec75345dbddceecc0d168ca909d63c18
treed7c03f2412f62739ae608c6ca940923247fc0d4f
parentbf0d5d04ab3900361d0b4762de8d51571a4c5176
parent0eded28c2371adb356fc6c48185455fd6257c0c5
Merge remote branch 'origin/v4-0-test'

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

metze