Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 22 Jan 2014 10:36:50 +0000 (11:36 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 22 Jan 2014 10:36:50 +0000 (11:36 +0100)
Change-Id: Ifcb0e0bac29c11980ea2a9d67b12e1b79c4bd9f6

1  2 
src/plugins/gstreamer/camerabin/camerabinsession.cpp