From: Andre Noll <maan@systemlinux.org>
Date: Sun, 27 Oct 2013 08:37:44 +0000 (+0100)
Subject: Merge branch 't/buffer_tree_improvements'
X-Git-Tag: v0.5.1~9
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=b3644a3f5de245609dc608a947ed71e2f75b2fd5;p=paraslash.git

Merge branch 't/buffer_tree_improvements'

Was cooking for about a month.

	bcea04 btr: Simplify btr_node_status().
	072391 buffer_tree: Improve btr_splice_out_node().
---

b3644a3f5de245609dc608a947ed71e2f75b2fd5
diff --cc NEWS
index d1155022,7cd6838e..fc6ccffb
--- a/NEWS
+++ b/NEWS
@@@ -1,12 -1,6 +1,13 @@@
  NEWS
  ====
  
 +----------------------------------------------
 +0.5.1 (to be announced) "temporary implication"
 +----------------------------------------------
 +
 +	- audiod improvements and fixes.
++	- buffer tree robustness improvements.
 +
  ----------------------------------------
  0.5.0 (2013-08-23) "invertible validity"
  ----------------------------------------