Merge branch 'master' of git://github.com/melinath/philo
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Thu, 8 Jul 2010 00:30:30 +0000 (20:30 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Thu, 8 Jul 2010 00:30:30 +0000 (20:30 -0400)
commitdb0947dc7adfb2361f01e61eb495b1638cbc446b
tree99c131660f6c2fa8b376a1783987c8344445aa45
parent6a190783eab3899c15d667e14ff20d2112d674d0
parent0ba6fc725e250ec9a063db7dbfdc7d85619e603c
Merge branch 'master' of git://github.com/melinath/philo

* 'master' of git://github.com/melinath/philo:
  Changed to delete empty contentreferences on pages instead of saving them as empty.
  Minor corrections to containers to ensure setting of context var even in cases where content=None
  Added admin imports