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)
commit5629695bf0cb97b135eb076caf92e0382b2d8290
tree9c90510a1a3415cfbf51be069fe78c39cfdfdf1e
parent949db689dc364fbff5384cd24dc8c1a9892369ab
parent2e6ad400272d774b72f682bc9f843379b03382b2
Merge branch 'hotfix/oberlin_references' into taggit