git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e96369a 69da38d)
Merge branch 'syndication' into develop
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 22 Jun 2011 02:12:22 +0000 (22:12 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 22 Jun 2011 02:12:22 +0000 (22:12 -0400)

Trivial merge
Foundation for web content management systems using Django.