Merge branch 'master' into login_browser
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 8 Nov 2010 07:43:59 +0000 (09:43 +0200)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 8 Nov 2010 07:43:59 +0000 (09:43 +0200)
commit58e9620f35a4317bae95cb4e363b1442bdc4c5e2
treea6931da702b2789d4d0ade909d505d61c9a442d0
parent6a032ca1d871100c07c9679b547c66a6c13d8622
parentfbf91de91faec80e90fd76bea235b6e958abcd3d
Merge branch 'master' into login_browser
src/facebookservice/facebookauthentication.cpp
src/situareservice/situareservice.cpp
src/src.pro