Merge branch 'master' into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 3 Sep 2010 11:50:24 +0000 (13:50 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 3 Sep 2010 11:50:24 +0000 (13:50 +0200)
commit0d086a27a88d04b315775cd42385f3d6413b9175
treea282f04902d0dfbeab4ad214b4f1b0db3c9f97c6
parent3a474ba21f9ee414f14ba783e038c01ff9cd0c6c
parent65469884bf3481f84cf8ed707fc3fa0571ede1c9
Merge branch 'master' into google

Conflicts:
src/plugins/google/google.pro
src/plugins/google/google.pro
src/plugins/xdxf/xdxf.pro