Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
authorRoger Braun <roger@rogerbraun.net>
Mon, 17 Apr 2017 09:37:21 +0000 (11:37 +0200)
committerRoger Braun <roger@rogerbraun.net>
Mon, 17 Apr 2017 09:37:21 +0000 (11:37 +0200)

Trivial merge