Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorJari Jarvi <t7jaja00@students.oamk.fi>
Tue, 29 Jun 2010 13:15:09 +0000 (16:15 +0300)
committerJari Jarvi <t7jaja00@students.oamk.fi>
Tue, 29 Jun 2010 13:15:09 +0000 (16:15 +0300)
commit37f77af4d697e9a666850015c14fc45af099906a
tree2894fef3e799ee9ddcdc4863a750de0759262cde
parent37be780bb9989c59fa1a0a5971ca13ab083e0ab1
parentd5cd94c31a45eb90caccd63e305fedb2da3209c9
Merge branch 'master' of mercury.wipsl.com:/var/git/irwi

Conflicts:
ut/stubs/qnetworkreply.cpp
ut/stubs/qnetworkreply.h
ut/stubs/qnetworkreply.cpp