Merge commit 'release-4-0-0alpha15' into master4-tmp
authorStefan Metzmacher <metze@samba.org>
Fri, 24 Jun 2011 07:39:33 +0000 (09:39 +0200)
committerStefan Metzmacher <metze@samba.org>
Fri, 24 Jun 2011 07:39:33 +0000 (09:39 +0200)
commit4031ff121d7f9a6b1dab8bd8ed54b47195f03955
tree3d87af188be6a95a727f28251ee4d8daf95409e7
parentd43d8f2a75c4a005f04aee3197394da634766335
parent6925a799d04c6fa59dd2ddef1f5510f9bb7d17d1
Merge commit 'release-4-0-0alpha15' into master4-tmp