Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:17:23 +0000 (16:17 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:17:23 +0000 (16:17 +0200)
commit59039554bd6bbf98e4ba111ecb20769c57db0d4d
treeb87385095733c9f3c1ca6d73131a7e6d46d2995e
parent46ab901c3f1a1f12ed7ad05a17cef19d1672c39e
parent4674a1cdf9cb721c9306576a76d4fe2c6425fe51
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I468ad5664b2c462812a0046d14024a19392f24db