Merge branch 'julian'
authorHarris Lapiroff <hlapirof@oberlin.edu>
Tue, 5 Apr 2011 17:00:23 +0000 (13:00 -0400)
committerHarris Lapiroff <hlapirof@oberlin.edu>
Tue, 5 Apr 2011 17:00:23 +0000 (13:00 -0400)
1  2 
contrib/julian/models.py

Simple merge