Merge branch 'nodiscard' of /home/jelmer/samba4
authorJelmer Vernooij <jelmer@samba.org>
Sun, 15 Mar 2009 14:39:15 +0000 (15:39 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 15 Mar 2009 14:39:15 +0000 (15:39 +0100)
commit8edd73759de2faf139d22fc1eec04192375449ae
treeb1afdbba9cc8316dcd8f3d98001fae3451b0b28a
parentc223beee2a0bd6922eda4551caec0061c86097f2
parent75783473d180661257e3f0e3d300179caf34bd8e
Merge branch 'nodiscard' of /home/jelmer/samba4