git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3269dd0 c929574)
Merge branch 'search'
authorStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 3 Mar 2011 22:14:02 +0000 (17:14 -0500)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 3 Mar 2011 22:14:02 +0000 (17:14 -0500)

Trivial merge
Foundation for web content management systems using Django.