Fix #1570 : php 4.2.x error on conflict merging
[lhc/web/wiklou.git] / FAQ
1 The FAQ is at: http://meta.wikimedia.org/wiki/MediaWiki_FAQ