Tim-Philipp Müller 91a58ccda1 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
2012-02-12 17:03:37 +00:00
..
2011-11-28 13:30:27 +00:00
2012-02-03 16:14:08 +01:00
2012-02-10 16:23:14 +01:00
2012-02-06 22:15:45 +01:00
2012-02-10 16:23:14 +01:00
2012-02-10 16:23:14 +01:00
2011-11-28 13:30:27 +00:00
2011-11-28 13:30:27 +00:00
2011-11-28 13:30:27 +00:00
2012-02-10 16:23:14 +01:00
2012-02-07 10:30:28 +01:00
2011-08-03 10:59:56 +02:00