Fix conflicts in last commit

Aleksander Machniak

2013-07-04 c3fe8a0b7a04bb0b27d69f60bb893264f77b30e0

1
2
3
-- Updates from version 0.7-beta
 
ALTER TABLE "session" ALTER sess_id TYPE varchar(128);