Jonathan Ellis 3205e5dbbc Revert CASSANDRA-5838		2013-08-30 13:35:16 -05:00
..
java/org/apache/cassandra	Revert CASSANDRA-5838	2013-08-30 13:35:16 -05:00
resources/org/apache/cassandra	merge from 1.2	2013-08-28 23:14:35 -05:00