1.6.8 in meta and changelog
Merge pull request #318 from Incubaid/meta

1.6.8 in meta and changelog
timeout for drop_master (useful in a cluster doing maintenance)
feedback from pull request
Merge pull request #324 from Incubaid/drop-master-timeout

timeout for drop_master (useful in a cluster doing maintenance)
Merge branch 'incubaid-1.6' into 1.6-for-1.7

Conflicts:
	META
	debian/changelog
	src/paxos/master.ml
Merge pull request #325 from Incubaid/1.6-for-1.7

1.6 for 1.7