Merge branch 'master' of github.com:FinalsClub/karmaworld
authorCharles Holbrow <charlesholbrow@gmail.com>
Fri, 18 Jan 2013 18:55:24 +0000 (13:55 -0500)
committerCharles Holbrow <charlesholbrow@gmail.com>
Fri, 18 Jan 2013 18:55:24 +0000 (13:55 -0500)
commita30ddb8a98be13aad4f1bc592b5e58300337b7a1
tree836aca1b14d91ca462ccb681c960b6db702e30d2
parent6b28a01e6bd125754ecdeab74f96b79db3382378
parentc7b70a3fb706e17c3c5738216f81e6080d037975
Merge branch 'master' of github.com:FinalsClub/karmaworld
karmaworld/apps/notes/models.py