Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 11 Jul 2013 21:26:32 +0000 (23:26 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 11 Jul 2013 21:26:32 +0000 (23:26 +0200)
commit480e2550d7c3be5aecc1b6acdc32fb7cd80fe801
treea8d0d2321d4f17a319c02de14b1bdf5f0b08004f
parent1e2b1fef23181da20883a2979c2bf52aa5ad132b
parent3ecb005bc62826db13e1c82e799997e0b4181e75
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: If1557686dd6626724246f700e78f77f4ed7d6d0c