Merge branch 'master' of git://github.com/melinath/philo
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Mon, 9 Aug 2010 09:09:35 +0000 (05:09 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Mon, 9 Aug 2010 09:09:35 +0000 (05:09 -0400)
commit983293d923dcede8362ee17b27fc825b2a466096
tree5da8b5d7ef25b58850485f34821ab99618d91a80
parenta66152cd03df94d103944255b836ed6ebed6ed15
parent92691d27d00f2c9a1b0536020ca2a5c1ec07f3e3
Merge branch 'master' of git://github.com/melinath/philo

* 'master' of git://github.com/melinath/philo:
  Added unique_together constraint to Attributes and Relationships.
  Added a bit to newsletters to streamline interactions with them.
contrib/penfield/models.py
models/base.py