Load user types at the right place
Fix reading expired row value from row cache
patch by jbellis; reviewed by Mikhail Stepura for CASSANDRA-6325
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Improve Gossip tolerance of abnormally slow tasks
patch by jbellis; reviewed by jasobrown for CASSANDRA-6338
Merge branch 'cassandra-2.0' into trunk
Fix paging with reversed slices

patch by slebresne; reviewed by iamalesksey for CASSANDRA-6343
Merge branch 'cassandra-2.0' into trunk
Set minTimestamp correctly to be able to drop expired sstables correctly

patch by marcuse, reviewed by jbellis for CASSANDRA-6337
Merge branch 'cassandra-2.0' into trunk
add deprecation warning to cli
Follow-up for 6327

patch by krummas; reviewed by slebresne for CASSANDRA-6327
Fix AssertionError when doing set element deletion

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6341
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Make the CL native protocol code match the on in 2.0

patch by slebresne; reviewed by jasobrown for CASSANDRA-6347
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/db/ConsistencyLevel.java
Merge branch 'cassandra-2.0' into trunk
SSTable/SSTableReader cleanup

patch by yukim; reviewed by jbellis for CASSANDRA-6355
Recover from IOException in accept() thread
patch by Mihial Stepura; reviewed by jbellis for CASSANDRA-6349