Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 11 Jul 2013 21:27:54 +0000 (23:27 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 11 Jul 2013 21:27:54 +0000 (23:27 +0200)
commit520f62dc37f1aff1e4a61cdf4f4aa8a2d7559335
tree19681a8f859715f4299100ad66e9f1ea3137d29d
parent50aa9da79f8ec06f4c53ce1231021be2000684f8
parenta29af8f024c8fb4bfdf1ce9e6c03387c3abcaffa
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I1103984f1b0144df17ef4c5d7a1f3b3dd7a6e762