Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 11 Nov 2011 18:24:27 +0000 (19:24 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 11 Nov 2011 18:24:27 +0000 (19:24 +0100)
commitb0ccc61ed313042c352d82dfa35698cb90726591
treee217135c226c8557f1f2d6efaa9f53280d5b6d7e
parentaf1eec2ece0fdfab0fb35611d24ee279ffbb757c
parentd6a9de9e2aedc8b66ab3219902b5a37e8d65ada2
Merge branch 'master' into 0.11

Conflicts:
ext/pulse/pulseaudiosink.c
ext/pulse/pulseaudiosink.c
ext/pulse/pulsesink.c