Merge remote-tracking branch 'origin/stable' into dev
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Fri, 15 Nov 2013 11:00:01 +0000 (12:00 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Fri, 15 Nov 2013 11:00:38 +0000 (12:00 +0100)
commit86a34097ff0b1479938ef7ad28f33b4879b194b3
tree8c43a17185b75bcdd65c22f1a3547ca1278cea03
parentef3ba733ffd9df90af311574502b9a7d1400e3e2
parent88e03d26ffa2f2ba0bab3e2e76cc8dc573801b41
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ib98b1c255b014578ec914eeab550d5953f955550