From: Andre Noll <maan@systemlinux.org>
Date: Mon, 2 Jul 2012 06:52:16 +0000 (+0200)
Subject: Merge branch 't/alsa_fix'
X-Git-Tag: v0.4.11~11
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=128c594f32be41d928df432298a013a168891ab7;hp=128c594f32be41d928df432298a013a168891ab7

Merge branch 't/alsa_fix'

	3a56a6 alsa: Do not buffer more than 500ms.

Seems to work fine everywhere.
---