Merge branch 'sound'
authorP. F. Chimento <philip.chimento@gmail.com>
Sun, 30 Jan 2011 16:10:37 +0000 (17:10 +0100)
committerP. F. Chimento <philip.chimento@gmail.com>
Sun, 30 Jan 2011 16:10:37 +0000 (17:10 +0100)
commit87504b58306f29cf833637a9e9983e947e684ee1
treed69a5ad400ff40129c0b527cfc656528422a60d1
parentbf5bc4b0d129685482eefea499f39f874744e2fd
parent255ccacfef435c1a81c5f04ae6600a8c08052d9a
Merge branch 'sound'

Conflicts:
tests/Makefile.am
tests/Makefile.am
tests/plugin-loader.c