Merge branch 'django155' of github.com:FinalsClub/karmaworld into django155
authorBryan <btbonval@gmail.com>
Wed, 15 Jan 2014 03:07:23 +0000 (22:07 -0500)
committerBryan <btbonval@gmail.com>
Wed, 15 Jan 2014 03:07:23 +0000 (22:07 -0500)
commit2ee0c69efffdca3e43e12f0256ae144c6d383807
tree166415bcc2522af96d7324fbbb4b891ccb35115e
parent91c9e889ae41c347b6cd0bc91ff4ad456f70e222
parent836f891f64f8364d1e6f6bbf070e5f63389897c7
Merge branch 'django155' of github.com:FinalsClub/karmaworld into django155