Merge branch 'master' of ssh://git.samba.org/data/git/samba master
authorRafal Szczesniak <mimir@samba.org>
Wed, 27 Apr 2011 05:01:38 +0000 (07:01 +0200)
committerRafal Szczesniak <mimir@samba.org>
Wed, 27 Apr 2011 05:01:38 +0000 (07:01 +0200)
commitdd3ccb6b41fd156621cbf3e9014c501969abc45f
treee754efaab802a0b2752ddc66873c06482be4333f
parent11a6ece23a22998661a2c45abf09139942f9cfb3
parent722ec8b34743ad7670a747b9db1f47766752878d
Merge branch 'master' of ssh://git.samba.org/data/git/samba