From: hayao <shun819.mail@gmail.com>
Date: Fri, 26 Apr 2019 12:02:30 +0000 (+0900)
Subject: Merge branch 'master' of https://git.yuki-lab.xyz/git/Nakajima/serene-setup-wizard
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c9643f262d8b20666527deded138c52a57eb21d8;p=serene%2Fserene-setup-wizard.git

Merge branch 'master' of https://git.yuki-lab.xyz/git/Nakajima/serene-setup-wizard

# Conflicts:
#	DEBIAN/control
---

c9643f262d8b20666527deded138c52a57eb21d8