Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:09:41 +0000 (17:09 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:09:41 +0000 (17:09 +0100)
commit6e55d96d899b78d17de022f2e1d93f210ff7a1d0
tree508b3ed5ffa86f97109a2b9f5fec83028a687071
parent5173ee755e9d90c44b748f57090c0df8cf9a79df
parent4c9ff9aee8d235f7bf2a7c996682ead00434034d
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I79653f486b1c67f5dc2647847b4f79fa8b5f593f