nodetool history logging
patch by jasobrown; reviewed by Dave Brosius for CASSANDRA-5823
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/tools/NodeCmd.java