Merge branch 'master' of git://git.samba.org/tridge/autocluster
authorAndrew Tridgell <tridge@samba.org>
Fri, 8 Aug 2008 05:19:35 +0000 (15:19 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 8 Aug 2008 05:19:35 +0000 (15:19 +1000)
commit0b8a17ea0b265da2a39d22fba5fd206c80d996ec
tree1925e1d85ef6f630481c7ba4dc94cd0464041e10
parent88587ed7a3efdf11f898a6221a140cfffb480acd
parent7d92895f9d4ca6b17eeb3399cccec382e7b7e639
Merge branch 'master' of git://git.samba.org/tridge/autocluster