Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 14:10:54 +0000 (16:10 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 14:10:54 +0000 (16:10 +0200)
commit2230fe7c4a9e97e0f2bb24be19f6408857c9864e
treed2f2061c5fca443ced94578a8044c6b745685287
parent7b6a627315f012598dca23d3ff978a09bfba7969
parent1b02287e464efc999dda10ff57c0207e6f3648d5
Merge remote-tracking branch 'origin/release' into stable

Conflicts:
src/assistant/assistant/assistant.pro

Change-Id: I7ca59c8150a591c7e2ba57fd729421b4dba064d0