Merge branch 'master' of wip.pkgsrc.org:/pkgsrc-wip

[Jason Bacon <jwbacon%tds.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <jwbacon%tds.net@localhost>
Pushed By:	outpaddling
Date:		Fri Oct 2 09:46:06 2015 -0500
Changeset:	417ec088416ee1e430cf91202a6702e8706ddbe7


Log Message:
Merge branch 'master' of wip.pkgsrc.org:/pkgsrc-wip

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

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

diffstat:


diffs: