Merge branch 'master' of git://git.samba.org/samba
commitef869659e6e4c23c51ff661e14aeb88852b01856
authorThomas Nagy <tnagy2pow10@gmail.com>
Tue, 31 Aug 2010 11:08:29 +0000 (31 13:08 +0200)
committerThomas Nagy <tnagy2pow10@gmail.com>
Tue, 31 Aug 2010 11:08:29 +0000 (31 13:08 +0200)
tree053947587407d0466ffe93b04978bc15be8ff3e1
parent1075c763bd4a10ed2115ae68d29fae2e37eeb6e1
parent7c88ccde30b824e14183f7fd07f0c307c7ff693d
Merge branch 'master' of git://git.samba.org/samba