make BytesToken.toString only return hex bytes
patch by Juraj Sustek; reviewed by jbellis for CASSANDRA-5566
Merge branch 'cassandra-1.2' into trunk
sstablescrub respects MAX_HEAP_SIZE
Patch by Mina Naguib, reviewed by brandonwilliams for CASSANDRA-5562
Merge branch 'cassandra-1.2' into trunk
switch Paxos debug logging to Tracing
Fix CQL3 CAS conditions check
cqlsh: fix DESCRIBE after case insensitive USE

patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5567
Merge branch 'cassandra-1.2' into trunk
Update debian changelog date
Ninja-fix CQL3 version in CQL.textile
Merge branch 'cassandra-1.2' into trunk
Ninja-fix CQL3 version in CQL.textile
inline variable c2
accept simple iterator where closeable-ness is not needed
inline ISSTableColumnIterator -> OnDiskAtomIterator
inline AbstractColumnIterator
inline SimpleAbstractColumnIterator
simplify de-tombstoning of columns for pre-collated results
inline some synonyms of timestamp that no longer make sense as distinct concepts post-supercolumns
Slightly simplify/optimize columns collation