Merge branch 'master' of github.com:FinalsClub/karmaworld
authorCharles Holbrow <charlesholbrow@gmail.com>
Mon, 14 Jan 2013 19:44:41 +0000 (14:44 -0500)
committerCharles Holbrow <charlesholbrow@gmail.com>
Mon, 14 Jan 2013 19:44:41 +0000 (14:44 -0500)
commit57f6610116a9224e58e46c1d997b6175b5e9f3b3
treeb33e327fd26beacacc4231617faf5392e349d113
parentb42bb761c8f5d6eafd869a99e61fe2b093e46fa7
parent614fbcec71754c457f5a59d5827332c7a0cc9de0
Merge branch 'master' of github.com:FinalsClub/karmaworld
karmaworld/apps/notes/models.py