From: Andre Noll <maan@systemlinux.org>
Date: Sat, 13 Aug 2011 10:07:14 +0000 (+0200)
Subject: Merge branch 't/mad_sync_fix'
X-Git-Tag: v0.4.8~12
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=12db97b44ab84de5021f9a40760ccf5931aae347

Merge branch 't/mad_sync_fix'
---

12db97b44ab84de5021f9a40760ccf5931aae347
diff --cc NEWS
index 7d330ce4,7d330ce4..a9572d7b
--- a/NEWS
+++ b/NEWS
@@@ -17,6 -17,6 +17,7 @@@ are the highlights of this release
  	  to replace 5 lines in the config file (one for each audio
  	  format) by one single line. See the manual for details.
  	- Compiles cleanly also with llvm/clang.
++	- Corrupt mp3 files are handled more gracefully.
  
  --------------------------------------
  0.4.7 (2011-06-01) "infinite rollback"