From: Tim Vaughan <tgvaughan@gmail.com>
Date: Fri, 6 Sep 2019 22:21:54 +0000 (+0200)
Subject: Merge branch 'master' into url_addresses
X-Git-Tag: v2.0.0~24
X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=commitdiff_plain;h=d653528a7773debc54ae6474ee791d66fa4d91f5;hp=bf4f75fba708b20e264ed2484228367e7d5c97d4

Merge branch 'master' into url_addresses
---