Dave Ward be613bac53 Merged V4.1-BUG-FIX to HEAD ...

38589: Fixed merge issue


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@38590 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2012-06-29 22:26:23 +00:00

..

cmis

Merged V3.4-BUG-FIX to HEAD

2011-12-02 14:25:48 +00:00

imap/scripts

Merged V3.4-BUG-FIX to HEAD

2011-07-04 15:00:07 +00:00

remoteconnector

Merged V4.0-BUG-FIX to HEAD

2012-06-08 17:17:36 +00:00

remoteticket

Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD:

2012-04-24 16:12:47 +00:00

web

Merged BRANCHES/DEV/V4.1-BUG-FIX/root to HEAD/root:

2012-06-27 09:00:25 +00:00

webdav

Merged V4.1-BUG-FIX to HEAD

2012-06-29 22:26:23 +00:00

webservice

Merged V4.0-BUG-FIX to HEAD

2012-03-02 15:00:35 +00:00

SessionUser.java

Updated files to LGPL

2010-03-02 18:33:11 +00:00