modified:   README.md
Another Python Snowflake Client.

This library works with the current release (1.0.2) of Twitter
snowflake service. It's part of iPlantCollaborative's infrastructure.
It includes a console script so snowflake can be tested from the
console.

Merge branch 'master' of github.com:jmatt/python-snowflakeclient

Conflicts:
	README.md
	.git/MERGE_HEAD

	modified:   README.md
	new file:   setup.py
	new file:   snowflakeclient/Snowflake/Snowflake-remote
	new file:   snowflakeclient/Snowflake/Snowflake.py
	new file:   snowflakeclient/Snowflake/__init__.py
	new file:   snowflakeclient/Snowflake/constants.py
	new file:   snowflakeclient/Snowflake/thrift/Snowflake.thrift
	new file:   snowflakeclient/Snowflake/ttypes.py
	new file:   snowflakeclient/__init__.py
	new file:   snowflakeclient/client.py
	new file:   snowflakeclient/snowflake.py
	new file:   snowflakeclient/version.py