Merge branch 'master' into alak_leaks alak_leaks
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Mon, 5 Dec 2011 14:12:10 +0000 (16:12 +0200)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Mon, 5 Dec 2011 14:12:10 +0000 (16:12 +0200)
commit8f5f75c5806727ce68e9366a8f8d8c7b9a98cc00
tree1434d623ad4c3ef979196ea908db8087bbefa413
parent5a90d0c58a20b2814ee295dd9938e1588ecdcf60
parente93b8be65b5812cb4dbf5cc6c2a420ce1a2f6025
Merge branch 'master' into alak_leaks
lib/AccountsUI/account-settings-page.cpp