Merge branch 'master' of git://github.com/lapilofu/philo into develop
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 29 Jun 2011 11:17:40 +0000 (07:17 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 29 Jun 2011 11:17:40 +0000 (07:17 -0400)
commit148d23c4d83c672dfde4bd23d27b46857be8339f
tree84b97d36e93ecc4b36b30c49f0086fc7856e0125
parent1a56dac4a9131e6c453ef496fe8a496969e8ff0d
parentce50d74eab3826c1cb464864867769ba1cbbcf53
Merge branch 'master' of git://github.com/lapilofu/philo into develop

* 'master' of git://github.com/lapilofu/philo:
  Small correction to a bug that was raising an error on the account_required method of AccountMultiView in instances where no manage_account_page is specified. 'node' should be instead 'request.node'.