merge

[Jonathan A. Kollasch <jakllsch%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jonathan A. Kollasch <jakllsch%NetBSD.org@localhost>
Pushed By:	jakllsch
Date:		Sun Oct 4 08:11:19 2015 -0500
Changeset:	a06e0785b20b0a3e55a082c10a3e335646818b99


Log Message:
merge

This is my last pkgsrc-wip commit.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a06e0785b20b0a3e55a082c10a3e335646818b99

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:


diffs: