Merge remote-tracking branch 'translate/17.05.12-translate-20180523' into 17.05.x
authorFridolin Somers <fridolin.somers@biblibre.com>
Wed, 23 May 2018 19:14:26 +0000 (21:14 +0200)
committerFridolin Somers <fridolin.somers@biblibre.com>
Wed, 23 May 2018 19:14:26 +0000 (21:14 +0200)

Trivial merge