Merge pull request #202 from axet/for-15.05
authorMarkus Stenberg <fingon@iki.fi>
Mon, 27 Jun 2016 21:26:16 +0000 (00:26 +0300)
committerGitHub <noreply@github.com>
Mon, 27 Jun 2016 21:26:16 +0000 (00:26 +0300)
miniupnpd-2.0


Trivial merge