From: Nick Retallack <nickretallack@gmail.com>
Date: Tue, 1 Dec 2009 09:18:21 +0000 (-0800)
Subject: merged.  Oh no, we have two different user relationship models.  Mine's in relations... 
X-Git-Url: http://git.veekun.com/zzz-floof.git/commitdiff_plain/f263f51648eef9739caa92e19ec45b32d7a1e49e?hp=f263f51648eef9739caa92e19ec45b32d7a1e49e

merged.  Oh no, we have two different user relationship models.  Mine's in relations.py, and is used for stuff like by/for/of, most of which isn't implemented yet
---