updated maintainer's data
Fix for de-serialization.
Using vanilla django-money, when one did the following:

./manage.py dumpdata

the values were saved properly, i.e:

{
  'amount': '12',
  'amount_currency': 'USD',
}

however, after the de-serialization:

./manage.py loaddata [fixtures]

the currencies were omitted.

i have no idea (yet) how to write a test that proves that.. :/
Merge https://github.com/jakewins/django-money

Conflicts:
	setup.py
bumped to version 0.3.4
add tests for simple model
added reversion tests for testing serialization and deserialization
Merge branch 'master' of git://github.com/toudi/django-money into toudi-master

Conflicts:
	djmoney/serializers.py
Merge branch 'new_manager' of git://github.com/Stranger6667/django-money into Stranger6667-new_manager

Conflicts:
	djmoney/models/fields.py
	djmoney/tests/testapp/models.py
Merge branch 'cleanup' of git://github.com/Stranger6667/django-money into Stranger6667-cleanup

Conflicts:
	djmoney/models/fields.py
	djmoney/models/managers.py
	djmoney/tests/model_tests.py
Merge branch 'isnull_lookup' of git://github.com/Stranger6667/django-money into Stranger6667-isnull_lookup

Conflicts:
	djmoney/models/fields.py
	djmoney/tests/model_tests.py
	djmoney/tests/testapp/models.py
Merge pull request #36 from reinbach/master

updated maintainer's data
Merge branch 'master' of git://github.com/Stranger6667/django-money into Stranger6667-master

Conflicts:
	djmoney/serializers.py
Merge branch 'Stranger6667-master'
Re-fix for serializers #41 and make the test case actually save data in database. Closes #9.

Add proper test case to address description in #42.
Merge remote-tracking branch 'jakewins/master'

Conflicts:
	djmoney/models/fields.py
	djmoney/tests/__init__.py
	djmoney/tests/model_tests.py
	djmoney/tests/testapp/models.py
	setup.py
add django-reversion to tox.ini