git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7318a26 772152c)
Merge branch 'new_paginator'
authorStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 9 Aug 2010 15:40:24 +0000 (11:40 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 9 Aug 2010 15:40:24 +0000 (11:40 -0400)

Trivial merge
Foundation for web content management systems using Django.