Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 4 Jul 2013 13:28:40 +0000 (15:28 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 4 Jul 2013 13:28:40 +0000 (15:28 +0200)
commite193b6020036f1270475a1b9a24dae63621fe693
tree321f164ad201a6dff13744d4767406b72610f30c
parentd251ee9dcbd015f2acbe76231902b72163cd05a2
parentc152d9339f4fcee22e4ec17404ceb39794284f75
Merge remote-tracking branch 'origin/release' into stable

Change-Id: If58a09c4ed878ed7a1a350036ab1cc2e99a907f1