Merged revisions 3726-3727,3729-3732,3734-3735,3737-3738,3740-3741,3743,3745,3747,3752-3753,3756,3758-3769,3771,3773-3774,3778-3793,3797,3799-3804,3807,3809-3825,3827-3829,3831-3836,3838-3845,3847,3850,3852-3856,3859-3869,3871,3873-3882,3884-3885,3887-3890,3892-3895,3897-3902,3904,3906,3908,3910-3916,3918,3920,3922-3927,3929-3932,3934,3936-3937,3939-3946,3948-3955,3957,3959,3964,3967,3969-3975 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/freepbx/branches/2.2
fixed the svnmerge properies that got 'corrupted' from an inproper conflict in
another svnmerge.
