From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 19 Sep 2010 16:46:17 +0000 (+0200)
Subject: Merge branch 'lh/section-from-path'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/536c7a1eb201b44b9266babe087cb6f2b75e4a7f?hp=536c7a1eb201b44b9266babe087cb6f2b75e4a7f

Merge branch 'lh/section-from-path'

Conflicts:
	scan-tree.c
---