Merge branch 'master' of ssh://git.samba.org/data/git/ctdb
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 20 Jul 2011 05:53:11 +0000 (15:53 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 20 Jul 2011 05:53:11 +0000 (15:53 +1000)
commit69024f40bfa442950fe4dabf232cc4f7efe06f81
tree2929994f04fbd6ab6852d316cdccfa8b0d6be5e9
parent0a86d6ed91e924134d73ec3eb0b69bacee2d3f80
parent926a6d7f05d7fd0d87878901e41a22e8029773f1
Merge branch 'master' of ssh://git.samba.org/data/git/ctdb

(This used to be ctdb commit a1b3661973489f0111e7975fec422fb99a25f0c8)