Re: [Wikitech-l] Merging APIedit branch with trunk