From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sat, 11 Mar 2017 05:08:46 +0000 (+0100)
Subject: Merge branch 'master' of rpi2:src/ashd
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;ds=inline;h=6a5fd1e3a71aa64cdeed2951a78b423efcb2ebf7;p=ashd.git

Merge branch 'master' of rpi2:src/ashd
---

6a5fd1e3a71aa64cdeed2951a78b423efcb2ebf7