Merge branches '1.2' and '1.2' of 10.1.1.27:/shared/ctdb/ctdb-master into 1.2
authorRonnie Sahlberg <sahlberg@lenovo-laptop.(none)>
Tue, 5 Apr 2011 00:32:02 +0000 (10:32 +1000)
committerRonnie Sahlberg <sahlberg@lenovo-laptop.(none)>
Tue, 5 Apr 2011 00:32:02 +0000 (10:32 +1000)
commitafdde23217250775f078f5d95912e76a3b2962eb
treeed3383a7aba00363976b108809dd4d4c769b2ce9
parent13ccb717548ac0d5279e1c35bcedac4667bce1e2
Merge branches '1.2' and '1.2' of 10.1.1.27:/shared/ctdb/ctdb-master into 1.2