Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 28 Oct 2011 13:21:27 +0000 (15:21 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 28 Oct 2011 13:21:27 +0000 (15:21 +0200)
commit6e4acbec6bbb7900d023b7b8aca1c27debb2d846
tree0a6c9368f9b595cea6f25264104953f89d424ae4
parent211fd047733d469ad9d813b443702bd8391e96bf
parent1b93f1d8a2d6612745918f36df219771a8934c81
Merge branch 'master' into 0.11

Conflicts:
ext/sidplay/gstsiddec.cc
ext/sidplay/gstsiddec.cc