Merges an updated upstream from main.
authorAnže Videnič <anze.videnic@gmail.com>
Tue, 24 May 2016 06:49:13 +0000 (08:49 +0200)
committerAnže Videnič <anze.videnic@gmail.com>
Tue, 24 May 2016 06:49:13 +0000 (08:49 +0200)
commit11441db31dcbed7b2070e800bcb1b0e6547b86bd
tree4702e5b1e158a59f9736ed2465b5a157eb1a4679
parentb76e427286701104c84a869461ceb7339b1b943a
parent7886b207e673ee3cdf51715c8874a0c74f111500
Merges an updated upstream from main.
WEB-INF/resources/fi.lang.php
WEB-INF/resources/nl.lang.php