From: Vladislav Grishenko <themiron@mail.ru>
Date: Mon, 13 Jul 2015 13:12:41 +0000 (+0500)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1.1+git20160131-1~11^2
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=commitdiff_plain;h=b30bce275255b48de02783e85b8cb3e0ba9dea2e

Merge branch 'upstream'
---

b30bce275255b48de02783e85b8cb3e0ba9dea2e