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)
1  2 
buildtools/wafsamba/samba_version.py

Simple merge