Merge remote-tracking branch 'origin/dev' into stable
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 19 Feb 2014 09:04:30 +0000 (10:04 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 19 Feb 2014 09:05:11 +0000 (10:05 +0100)
commit13882cd5da72bf0f6657752344793103a43a8e41
tree6a3323763df5e42fc5d25a84786efff1f41c256e
parent391e8a7147edb1cdff6f1362ae0d3be4e7271ea7
parent01714ef0c5ee80544e3799ae2a66d9a611c9d71f
Merge remote-tracking branch 'origin/dev' into stable

Change-Id: I84b36fa41f3d5f8fea2dec2545f72ebe6a0c7908