Merge remote-tracking branch 'origin/bug-1439' into testserver-stable
authorBernhard Fröhlich <bernhard@cacert.org>
Wed, 16 May 2018 13:51:19 +0000 (15:51 +0200)
committerBernhard Fröhlich <bernhard@cacert.org>
Wed, 16 May 2018 13:51:19 +0000 (15:51 +0200)
commit09377a033f8e5632248844e9938cecd25fa62550
treea400e78eafde9246a6749b95b68b04d398fdd5d7
parent751d54c7bbf6ef7c8c4dd00c6fa44aae5e887103
parent61c3c79377096d31e34178e8f1b2bcaad58ada47
Merge remote-tracking branch 'origin/bug-1439' into testserver-stable

# Conflicts:
# www/cats/cats_import.php
www/cats/cats_import.php