Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 25 Jun 2013 21:27:28 +0000 (23:27 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 25 Jun 2013 21:27:28 +0000 (23:27 +0200)
commit18a8381ab324fce9ed162b63e185eaf541c2c92b
tree541b98ee213d390610000feae5022e6c3243eaaa
parentf424e8249b7b83d7d8f5a353161d2cc093840beb
parent1c0cfdf408a398f4fe3efded775341b50106505d
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I9ad818eecef74983e09660871f39ee66a6b666a1