Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 27 Jan 2014 17:54:20 +0000 (18:54 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 27 Jan 2014 17:54:20 +0000 (18:54 +0100)
commit9459acf48eaa9326e58bb1658408d045482a573b
tree395f0828e828c4bb9466262670c35f6e0ceff248
parent422099e8ddeddc0631db3a369e3c52f0ffe2f455
parent7451906b71e7271238ecf9446b7960ab2c647cc9
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I83d589c55e8463cce23068dc81096aa66ec596a5