Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 17:13:55 +0000 (19:13 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 17:13:55 +0000 (19:13 +0200)
commit46ab901c3f1a1f12ed7ad05a17cef19d1672c39e
treedfbb09e41bc627961da0929b72df3cc70bbc7d2b
parent0c79c2aa212a900568c26d08a036b0e38173ea3a
parent4bd45d7d2a32a170b4ed11b03752726b446fbb79
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I6cadf21a571a4d6608c75d4e79f5231c8e4ab5aa