Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 12 Mar 2013 10:30:13 +0000 (11:30 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 12 Mar 2013 12:13:43 +0000 (13:13 +0100)
commit46515c3c892178f23b42cff8f3eab72987d90499
tree826afb3b5919ee6193fbc68ce9597606efb2ea1e
parent93594e1299218eaee6f3bd7937626f48906843a5
parenta57ce3d8c1f098565d044993dbd8fa6cd5fb05b8
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I9f54f308efc4d165d091f215d0b031e4e895d749