Merge branch 'ubuntu'
authorOlivier Naudan <o-naudan@ti.com>
Thu, 10 May 2012 15:03:37 +0000 (11:03 -0400)
committerOlivier Naudan <o-naudan@ti.com>
Thu, 10 May 2012 15:04:06 +0000 (11:04 -0400)
commitb9fcdd49651dddbfce5d66c08750cf31b0946e64
tree6b84a287a7db6d6bfe5dcd14dc9591f41804ef88
parentbf73aa6d2c8d1d82e9ab257c44853b963712be18
parent97b5c4099c3d3890f5421f5c782e0a8b9af5488f
Merge branch 'ubuntu'

Conflicts:
debian/changelog
debian/control
debian/control.in
debian/gbp.conf
debian/gstreamer-plugins-good.install
debian/patches/07_move-camerabin.patch
debian/patches/series
debian/changelog
debian/control
debian/control.in
debian/gbp.conf
debian/gstreamer-plugins-good.install
debian/patches/series