Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 11 Oct 2013 14:18:46 +0000 (16:18 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 14 Oct 2013 12:35:38 +0000 (14:35 +0200)
commit677aac0e9223d59585c2b58c114801128145998b
tree5d80f78ca7f5a6593d42a7770ebf6f2558b2674d
parent85aadf8cb2f7125ae7457b78943d3486bd2d2133
parent7d24543c27bf3eebe1ac7c8f625c6e9c9fbdbdec
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
src/plugins/blackberry/camera/bbcamerasession.cpp

Change-Id: I7c86e10140ab86fd2a07e2f034dec38ae9112559
src/plugins/blackberry/camera/bbcamerasession.cpp