git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 949db68 2e6ad40)
Merge branch 'hotfix/oberlin_references' into taggit
authorStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 11 Jul 2011 15:26:41 +0000 (11:26 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 11 Jul 2011 15:26:41 +0000 (11:26 -0400)

Trivial merge
Foundation for web content management systems using Django.