Merge remote-tracking branch 'origin/stable' into dev
authorGunnar Sletta <gunnar.sletta@digia.com>
Tue, 5 Feb 2013 08:17:39 +0000 (09:17 +0100)
committerGunnar Sletta <gunnar.sletta@digia.com>
Tue, 5 Feb 2013 08:18:13 +0000 (09:18 +0100)
commitb4ac3d733eae9cfcf929f3ae4a50fc20d24dc808
tree952f5521f21022a762293436312bad89ff18da86
parent0bd009dfadb2e2187b29ebd27a6e6fdf8ff89c66
parent17626e935cbb477f93fc43082af5744731614e3a
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I550ba62203b0a5c4020181330185e77781dc76af