Merge branch 'master' of linz:/srv/git/php-utility-classes
authorRobert Kaiser <kairo@kairo.at>
Sun, 16 Apr 2017 23:13:06 +0000 (01:13 +0200)
committerRobert Kaiser <kairo@kairo.at>
Sun, 16 Apr 2017 23:13:06 +0000 (01:13 +0200)

Trivial merge