Merge branch 'stable'

Conflicts:
	scan-tree.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
lh/pretty-blob-view
Lars Hjemli 14 years ago
commit 69f705cf57

Diff Content Not Available