Merge branch 'v4-0-stable' into newmaster
authorJelmer Vernooij <jelmer@samba.org>
Mon, 20 Sep 2010 22:24:44 +0000 (15:24 -0700)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 20 Sep 2010 22:24:44 +0000 (15:24 -0700)
commitead126caace0cd94ab515f5d9f2199b60a84f914
tree3778093012c4216674321416788072f497ac3a4b
parent8853babb504298bd87fb5cae2120f2be63b08312
parentdb67f43aefccccedbd8bf59c7d97c99295b7a168
Merge branch 'v4-0-stable' into newmaster
buildtools/wafsamba/samba_version.py