Merge branch 'master' of git://git.samba.org/sahlberg/ctdb
authorMartin Schwenke <martin@meltin.net>
Tue, 24 Aug 2010 01:53:29 +0000 (11:53 +1000)
committerMartin Schwenke <martin@meltin.net>
Tue, 24 Aug 2010 01:53:29 +0000 (11:53 +1000)
commit718ddc2264c28185fcddbc9cb0c7137d198a43a7
tree8d820199b20e9c7156ea827c52f58ecf452254e3
parent6a33a7715067175869ea2f3f15b64c3371079a6b
parent6e4347eb8e62c28987820f6e58626271c900b011
Merge branch 'master' of git://git.samba.org/sahlberg/ctdb