Correct timestamp formatting in CQL3 doc
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0