make sure zone info gets completely read
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
make sure streams get closed
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Issue a warning after 3 empty lines in statement

patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-7142
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	bin/cqlsh
fix time conversion to milliseconds in SimpleCondition.await

patch by jzhang reviewed by dbrosius for cassandra-7149
Merge branch 'cassandra-1.2' into cassandra-2.0
remove changes line for 7149 as it was not pulled forward
Fixup for CASSANDRA-6831 on 2.1
Fix super column filter conversion

patch by slebresne; reviewed by thobbs for CASSANDRA-7138
Fix ClassCastException on composite dense tables

patch by slebresne; reviewed by thobbs for CASSANDRA-7112
Correctly delete scheduled range xfers

Patch by brandonwilliams, reviewed by aleksey for CASSANDRA-7143
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/StorageService.java
remove stray bat file
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Cleanup and optimize collation and slice iterators

patch by Aleksey Yeschenko and Benedict Elliott Smith; reviewed by
Aleksey Yeschenko for CASSANDRA-7107