Alan Davis 833aff69dc Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1) ...

- Correct merge error
   57582: Merged DEV to V4.1-BUG-FIX (4.1.8) with corrections
      56334: MNT-9712: VTI doesn't allow external authentication.
       - Modify org.alfresco.web.sharepoint.auth.BasicAuthenticationHandler to check Remote User 
       - Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@57656 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2013-11-05 12:31:19 +00:00

..

java/org/alfresco

Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)

2013-11-05 12:31:19 +00:00

META-INF

Merged V4.0-BUG-FIX to HEAD

2012-05-18 17:00:53 +00:00

test-java/org/alfresco/web

Reverse Merged. Commit to wrong branch. Should have been HEAD-BUG-FIX.

2013-10-30 10:29:01 +00:00

test-resources

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

web

Merged DEV to V4.2-BUG-FIX (4.2.1)

2013-10-30 09:08:00 +00:00