added file-c in develop branch
added file-c in develop branch
Merge branch 'develop' of https://github.com/skangayam/cassandra into develop
Merge branch 'release/20140528055510'