Tom 66dec3b874 Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

..

Appearance

Hack around with the NPC module to get osNpcCreate() partially working again.

2011-06-29 00:28:22 +01:00

Chat

minor: stop irc bridge warning about not attached to regions if it's not been turned on in the first place

2010-04-16 21:23:01 +01:00

Concierge

Comment out some startup logging lines to make up for the one I added earlier on.

2011-04-02 02:29:42 +01:00

Voice

Merge branch 'master' into careminster-presence-refactor

2011-06-30 00:26:03 +01:00

XmlRpcGroups

rename TestHelper => TestHelpers for consistency

2011-08-06 00:31:03 +01:00