Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
authorRoger Braun <roger@rogerbraun.net>
Wed, 26 Apr 2017 06:56:18 +0000 (08:56 +0200)
committerRoger Braun <roger@rogerbraun.net>
Wed, 26 Apr 2017 06:56:18 +0000 (08:56 +0200)

Trivial merge