Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 12 Feb 2012 17:03:37 +0000 (17:03 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 12 Feb 2012 17:03:37 +0000 (17:03 +0000)
commit91a58ccda12011324ca1075a93ab70fa3c2c2f72
tree5fb057753a72bddd25e7867f3e967d57d4127dfc
parent8620c16b275dd3ec955d99af77ea06d3441ff533
parent736f68e1e6c4b79ed807ad9888ae7dfd8b204058
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
ext/taglib/gstapev2mux.cc
ext/taglib/gstid3v2mux.cc
ext/taglib/gsttaglibmux.c
ext/taglib/gsttaglibmux.h
ext/taglib/gstapev2mux.cc
ext/taglib/gstid3v2mux.cc