Unmerging r71867. Merge-conflicts with some things Nikerabbit was doing. He broke...
authorAndrew Garrett <werdna@users.mediawiki.org>
Sun, 29 Aug 2010 03:08:15 +0000 (03:08 +0000)
committerAndrew Garrett <werdna@users.mediawiki.org>
Sun, 29 Aug 2010 03:08:15 +0000 (03:08 +0000)
commit2c50a8b9aa5f1a4ba636982b159e64fe61c0845f
tree77e1e1a0c413671b0a9e272e2a70923febadb02a
parent41a7f65ee12166d6e1558fa117b5f8e1e37cb144
Unmerging r71867. Merge-conflicts with some things Nikerabbit was doing. He broke it, leaving him to fix it for now :-)
languages/Language.php