[fsnet] 2 new revisions pushed by Leborgne...@gmail.com on 2013-03-22 14:00 GMT

[fs...@googlecode.com]

2 new revisions:

Revision: 50d136b3d7c4
Author: Marc Leborgne <leborgne...@gmail.com>
Date: Fri Mar 22 06:53:07 2013
Log: Merge modification of master in struts
http://code.google.com/p/fsnet/source/detail?r=50d136b3d7c4

Revision: cba51e29ef8c
Author: Marc Leborgne <leborgne...@gmail.com>
Date: Fri Mar 22 06:58:49 2013
Log: Merge remote-tracking branch 'origin/master' into struts...
http://code.google.com/p/fsnet/source/detail?r=cba51e29ef8c

==============================================================================
Revision: 50d136b3d7c4
Author: Marc Leborgne <leborgne...@gmail.com>
Date: Fri Mar 22 06:53:07 2013
Log: Merge modification of master in struts
http://code.google.com/p/fsnet/source/detail?r=50d136b3d7c4

Modified:
/fsnetWeb/src/main/java/fr/univartois/ili/fsnet/actions/GenerateCv.java

/fsnetWeb/src/main/java/fr/univartois/ili/fsnet/actions/ManageConsultations.java
/fsnetWeb/src/main/java/fr/univartois/ili/fsnet/actions/ManageGroups.java
/fsnetWeb/src/main/java/fr/univartois/ili/fsnet/actions/ManageProfile.java
/fsnetWeb/src/main/java/fr/univartois/ili/fsnet/actions/TalkMembers.java

==============================================================================
Revision: cba51e29ef8c
Author: Marc Leborgne <leborgne...@gmail.com>
Date: Fri Mar 22 06:58:49 2013
Log: Merge remote-tracking branch 'origin/master' into struts

Conflicts:

fsnetWeb/src/main/java/fr/univartois/ili/fsnet/actions/ManagePrivateMessages.java
fsnetWeb/src/main/java/fr/univartois/ili/fsnet/actions/ManageProfile.java
fsnetWeb/src/main/java/fr/univartois/ili/fsnet/actions/TalkMembers.java
fsnetWeb/src/main/webapp/WEB-INF/struts-configs/talk-config.xml

http://code.google.com/p/fsnet/source/detail?r=cba51e29ef8c

Modified:

/fsnetWeb/src/main/java/fr/univartois/ili/fsnet/actions/ManagePrivateMessages.java
/fsnetWeb/src/main/java/fr/univartois/ili/fsnet/actions/ManageProfile.java
/fsnetWeb/src/main/java/fr/univartois/ili/fsnet/actions/TalkMembers.java