Versions and license for 1.2.11 release
Add ability to list specific KS/CF combinations in nodetool cfstats
Patch by Lyuben Todorov, reviewed by brandonwilliams for CASSANDRA-4191
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	build.xml
	debian/changelog
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/tools/NodeCmd.java
Merge branch 'cassandra-2.0' into trunk