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)
commit819f30df336ec58ec487f19919ade198d016826d
tree8e64156c1280ce42f2f45f8557354207a7acee00
parent60fb11d9a2f5ff659a6ccffe01b4de16c1fb5929
parenta0746fe49c186566fc8c619daf0b8bb82929ac55
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ifcb0e0bac29c11980ea2a9d67b12e1b79c4bd9f6
src/plugins/gstreamer/camerabin/camerabinsession.cpp