From 536c7a1eb201b44b9266babe087cb6f2b75e4a7f Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 19 Sep 2010 16:46:17 +0000
Subject: Merge branch 'lh/section-from-path'

Conflicts:
	scan-tree.c
---
(limited to 'Makefile')

--
cgit v0.9.0.2