Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
authorRoger Braun <roger@rogerbraun.net>
Mon, 22 May 2017 17:08:46 +0000 (19:08 +0200)
committerRoger Braun <roger@rogerbraun.net>
Mon, 22 May 2017 17:08:46 +0000 (19:08 +0200)

Trivial merge