Merge branch 'master' into lang_update_412
commit326166e1827f1b335d9fc0cd550991cda8cf318d
authorAndreas Gohr <andi@splitbrain.org>
Tue, 6 Jun 2017 13:03:40 +0000 (6 15:03 +0200)
committerGitHub <noreply@github.com>
Tue, 6 Jun 2017 13:03:40 +0000 (6 15:03 +0200)
treeea083eb606026acd27a789ea10a8b75f276349fa
parentc15dcaeb532fa6c1a617bba3d419cfae72207d9f
parentf341e0d76d0f0f24340d2e69d33229293c773027
Merge branch 'master' into lang_update_412
inc/lang/eu/lang.php