merge with upstream
simple, bad currency_choices test
Merging with creat1va, fixing test suite, moving tests to application dist, and adding runtests script
Merge pull request #16 from benjaoming/currency_choices

Currency choices
fix django<1.5 compat
fix serialization support and reversion support
Merge branch 'master' of github.com:jakewins/django-money into currency_choices
Fix support for abstract classes #13 and add tests
add comment about break loaddata and dumpdata support
fix broken setup.py
fix broken loaddata and dumpdata commands
change maintainer
pull #16 comment, adding back Reinbach as maintainer
pull #16 comment -- change URL to jakewins
pull #16 comment -- Correct the source code url
Merge pull request #24 from mariocesar/patch-1

Correct the source code url in the docs
Deserializer broke fixtures loading before unittesting
Merge pull request #25 from jneight/master

Deserializer broke fixtures loading before unittesting
Merge branch 'master' of github.com:creat1va/django-money

* 'master' of github.com:creat1va/django-money:
  fix SyntaxError: keyword argument repeated