Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 2 Mar 2012 11:07:22 +0000 (12:07 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 2 Mar 2012 11:07:22 +0000 (12:07 +0100)
commit32bb92f2fad6a23ecefb0ee6c4225b1358994c6d
treedcbd2dbbdc81eb541346f28e89e943c502f37a50
parentf9bdf436f90c92d1783554715903a92d7534e500
parent06135dcf7b03f11d1111273f74415a76a5f9e36b
Merge branch 'master' into 0.11

Conflicts:
tests/examples/Makefile.am
tests/examples/playback/playback-test.c
configure.ac
tests/examples/Makefile.am
tests/examples/playback/playback-test.c
tests/examples/seek/Makefile.am