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

[Makoto Fujiwara <makoto%ki.nu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Wed Sep 23 19:42:26 2015 +0900
Changeset:	c7a1c4c320744f9f80b6f3b064617926754487a8


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=c7a1c4c320744f9f80b6f3b064617926754487a8

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

diffstat:


diffs: