Merge branch 'mob' into private-groupchat
commitc6d68625363d93f42c43a8aa27da34fee924e622
authorStefan Becker <stefan.becker@nokia.com>
Wed, 22 Sep 2010 03:40:05 +0000 (22 06:40 +0300)
committerStefan Becker <stefan.becker@nokia.com>
Wed, 22 Sep 2010 03:40:05 +0000 (22 06:40 +0300)
tree9996ccf84d997f221266377f0953b9ced6c249ca
parentee8f8431770fb73f28888bc86aa00a3bc395915d
parent413435a79edf70273034798bf5b3d7163cd04141
Merge branch 'mob' into private-groupchat