Merge branch 'mob' into private-chatid-rework
commit4a8479088b0b34b3771a9cb47e6cec979cf678b7
authorStefan Becker <stefan.becker@nokia.com>
Mon, 4 Oct 2010 09:40:14 +0000 (4 12:40 +0300)
committerStefan Becker <stefan.becker@nokia.com>
Mon, 4 Oct 2010 09:40:14 +0000 (4 12:40 +0300)
tree950a52ee2092cf421414a1c84b2192544bc25501
parent5d03c3a98159b7edbb04cc5fdcd665bbffca22f8
parentc1e71af50c230a50d1458a32b20743b66b3e6f84
Merge branch 'mob' into private-chatid-rework