Merge branch 'master' of git://git.samba.org/sahlberg/ctdb
authorMartin Schwenke <martin@meltin.net>
Thu, 26 Aug 2010 01:06:57 +0000 (11:06 +1000)
committerMartin Schwenke <martin@meltin.net>
Thu, 26 Aug 2010 01:06:57 +0000 (11:06 +1000)
commit090d9c8443cfa13d45f8c5d2845aea5aa9f7251d
tree8555046a4ec80534592d4ef7269e9db4bec55f33
parent718ddc2264c28185fcddbc9cb0c7137d198a43a7
parent292d7435a360efd7f15a7a99f658a605e07c0a81
Merge branch 'master' of git://git.samba.org/sahlberg/ctdb