From: Andre Noll <maan@systemlinux.org>
Date: Mon, 7 Dec 2009 17:07:21 +0000 (+0100)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.4.1~10
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=59cf2c9960d35d409a3610281b81b2e59ad7e5d1;p=paraslash.git

Merge commit 'meins/master'
---

59cf2c9960d35d409a3610281b81b2e59ad7e5d1
diff --cc NEWS
index 3f6ae459,47798d73..019f936e
--- a/NEWS
+++ b/NEWS
@@@ -5,11 -5,15 +5,15 @@@ NEW
  0.4.1 (to be announced) "concurrent eternalty"
  ----------------------------------------------
  
+ Support for another audio format and bug fixes: All fixes that have
+ been accumulated in the 0.3.6 release appear in this release as well.
+ 
  	- wma support
+ 	- new afh option: --human to activate human-readable output
  
 -------------------------------------------
 -0.3.6 (to be announced) "cubic continuity"
 -------------------------------------------
 +-------------------------------------
 +0.3.6 (2009-12-07) "cubic continuity"
 +-------------------------------------
  
  Quite a few bugs have been found and fixed since 0.3.5, so here's
  another 0.3.x release. No new features.