Included are two patch files for the freepbx trunk and the modules 2.1 branch. The following are added by these patches (hope I didn't forget anything):
Follow-Me Module including a module hook for page.extensions.php and page.users.php to allow navigation between an extension's follow-me configuration and back.
Direct DID+Alert Info Routing from page.extensions.php and page.users.php. This allows a DID to be supplied for an extension/user as well as a corresponding Alert Info when a call comes in on that DID. The purpose is to accomodate installations where many/all extensions have direct DID as it becomes a management challenge and error prone to duplicate it all in incoming routing. (? - should privacy manager be added in this same location?)
Added TRUNK_OPTIONS ot page.general.php. This is identical to DIAL_OPTIONS but is only used for macro-dialout-trunk. There are many reasons why you may NOT want to have your DIAL_OPTIONS (for internal dialing) applied to outbound calls.
I think that is it. There were some mods to extensions.conf. Also to page.ivr.php. Beyond that here are a few misc comments. Added the proper changes in ringgroups module to the install.sql file for the alertinfo addition as it had not been done. I believe I added all needed sql install / uninstall and upgrade stuff for my changes. I noticed that the incoming table is not correct for newinstall.sql given the zap changes but did not change it, jut noticed it while backing out my xap channel routing that I had done.
The patch files will be attached as soon as I submit this.