Merge branch 'krogoth-stable' into krogoth
authorAndreas Oberritter <obi@opendreambox.org>
Tue, 27 Feb 2018 21:08:26 +0000 (22:08 +0100)
committerAndreas Oberritter <obi@opendreambox.org>
Tue, 27 Feb 2018 21:08:26 +0000 (22:08 +0100)
commit4248424cf45494c690ab939dbda61ddf6049c45c
treed382e14cef9dddbcfeebe955650c10e64ea4fc7e
parente75f58e1a494a56c5bf56e0814862e33289dd718
parent93ac00a80e9243a1fd8991baa5851651c78a2294
Merge branch 'krogoth-stable' into krogoth