Merge branch 'master' of ssh://git.samba.org/data/git/samba into strhex
authorJelmer Vernooij <jelmer@samba.org>
Sun, 19 Oct 2008 08:45:25 +0000 (10:45 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 19 Oct 2008 08:45:25 +0000 (10:45 +0200)
commit2c8cf0b394e8625017a1290f73d0007d3b5b6d20
tree9d63288e05bbc7b8d8f75b8373884ce7613ba305
parentc484b0465c8c2298c8d439677412f34e6bdd17f1
parent694a579cb8d418a4feb441a77c0dc000023f2c6e
Merge branch 'master' of ssh://git.samba.org/data/git/samba into strhex