git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92aff11 c3ff61f)
Merge branch 'better_feeds'
authorStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 8 Feb 2011 22:10:47 +0000 (17:10 -0500)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 8 Feb 2011 22:10:47 +0000 (17:10 -0500)

Trivial merge
Foundation for web content management systems using Django.