migrate 1.1 schema_columnfamilies.key_alias column to key_aliases
patch by Alex Liu; reviewed by Tyler Hobbs for CASSANDRA-5800
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0
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
Merge branch 'cassandra-2.0' into trunk