Here is few tips to help pfc integrators to merge external contributions into the official branch.
Contributors will submit pull request from github interface. You will review the code and accept or not the contribution. If you accept it, you can merge it to the official source code in two ways:
git clone git@github.com:kerphi/phpfreechat.git
git remote add cweener https://github.com/Cweener/phpfreechat.git
git pull Cweener master
or just cherry-pick few commits:
git cherry-pick 3821c98c15f79f46f16d
(notice: the commit id can be found from the github interface)
git commit -a
git push
When you commit things to the official pfc source code, don't forget to edit the changelog on the phpfreechat website.