From: Ian Delaney <idella4@gentoo.org>
Date: Tue, 8 Mar 2016 02:04:10 +0000 (+0800)
Subject: Merge remote-tracking branch 'remotes/sbraz/syncthing'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1793e37c9c68cc22c7bbd44f081c4224eca5fe6c;p=gentoo.git

Merge remote-tracking branch 'remotes/sbraz/syncthing'

Pull request: https://github.com/gentoo/gentoo/pull/1000
---

1793e37c9c68cc22c7bbd44f081c4224eca5fe6c