From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 7 Nov 2010 15:25:23 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Tag: v0.9~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69f705cf5727cc1f099f6cd6af759f66bfd9a343;p=cgit

Merge branch 'stable'

Conflicts:
	scan-tree.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---

69f705cf5727cc1f099f6cd6af759f66bfd9a343