Merge "Add CollationFa"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 15 Dec 2016 13:37:56 +0000 (13:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 15 Dec 2016 13:37:56 +0000 (13:37 +0000)
1  2 
autoload.php
includes/collation/Collation.php

diff --cc autoload.php
Simple merge
Simple merge