conflicts
authorsmita <smita@smita-laptop.(none)>
Tue, 14 Dec 2010 14:31:34 +0000 (16:31 +0200)
committersmita <smita@smita-laptop.(none)>
Tue, 14 Dec 2010 14:31:34 +0000 (16:31 +0200)
commitf06af1dd6795a098335cf2fa0ac38b3f3036abb1
treed57ef96edb94a68d794ea4237b75c2e178208dbf
parent2efe7bd7300032af00f931efdc3d532b80b415dc
parent7ab927a96de43221700d57f8447fed77021edd32
conflicts
lib/AccountsUI/provider-plugin-proxy.cpp