Merge branch 'master' of ssh://git.samba.org/data/git/ctdb
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Sun, 19 Feb 2012 22:54:52 +0000 (09:54 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Sun, 19 Feb 2012 22:54:52 +0000 (09:54 +1100)
commit40906c0e7b702c037a3ea3f41d0b114476a302a9
tree7dd9ce3b2659253f58a12ceb05d32eb3dcbb548f
parent1cfefb406f289a9d1d7601e4e4708725b4782ac4
parent64208e04a5767844eff9d05644020246be530f2e
Merge branch 'master' of ssh://git.samba.org/data/git/ctdb

(This used to be ctdb commit d3c54ae9cc83f74d15f40bbfff95404b270d2f80)