Merge remote-tracking branch 'origin/release' into stable
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 18 Mar 2013 13:03:12 +0000 (14:03 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 18 Mar 2013 13:03:23 +0000 (14:03 +0100)
commit8175793c5edb2ba758a0271036b4f376d3c3c319
tree88be6ce463e2bc4b115083d79b8e24cb0f2eb555
parent5717e881ae7246e3ab2e1df12af73378ebaad824
parent28602be6bfc1601d260519b4be529e8b25a82506
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I548e33c0d8c7b1c707d5be6ee2395bb313219e6f