Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 22 Jan 2014 10:36:29 +0000 (11:36 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 22 Jan 2014 10:36:31 +0000 (11:36 +0100)
commitce130de453e561477b30643a27638e0707ac5c54
tree04f764cf1ecf9bd6c7cdff90ccaf5bf9eb9c362f
parent918159a2aae5062935a946e6d64120769802d625
parenta5669568904b37b1d6b297e7190d18306e198604
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I2d9356cfb33f36f0b9167307b0c4fc6b71bb347a