Fix conflicts in last commit

Aleksander Machniak

2013-07-04 c3fe8a0b7a04bb0b27d69f60bb893264f77b30e0

1
2
3
4
5
6
7
8
9
10
-- Updates from version 0.5.x 
 
ALTER TABLE [dbo].[contacts] ADD [words] [text] COLLATE Latin1_General_CI_AI NULL  
GO 
CREATE INDEX [IX_contactgroupmembers_contact_id] ON [dbo].[contactgroupmembers]([contact_id]) ON [PRIMARY] 
GO 
DELETE FROM [dbo].[messages] 
GO 
DELETE FROM [dbo].[cache] 
GO