Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 28 Feb 2013 15:48:09 +0000 (16:48 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 28 Feb 2013 15:49:06 +0000 (16:49 +0100)
commitbe3fb9afe50361e4b35d02d28ef30851335b17b6
tree8627b1ab4a5d843b9e27b78e7341553e624ef4fc
parent42507173bd985d8b3875d9fd0141a1dd7ad4e544
parenta65982d659226ace42fe0a0ca0a2f15523e95e4b
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I6b49d5e1c31599b5aa4940b798533b17e58616bf
configure