Fix some things from a pretty mangled merge
authorMichael J. Rubinsky <mrubinsk@horde.org>
Tue, 29 Sep 2009 20:51:47 +0000 (16:51 -0400)
committerMichael J. Rubinsky <mrubinsk@horde.org>
Tue, 29 Sep 2009 20:54:02 +0000 (16:54 -0400)
commita8cc7e6530013a631585a6399f3a37d1ed56c932
tree1bb6bbd0fa10f789142d34a44cde3c427e08e535
parent3a1be0cc067bd6ee61513e8afc4d10a005bd3cc8
Fix some things from a pretty mangled merge
kronolith/attendees.php
kronolith/lib/Resource.php
kronolith/lib/Resource/Base.php
kronolith/lib/Resource/Group.php