Index: assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
===================================================================
--- assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	(revision 38143)
+++ assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	(working copy)
@@ -9236,7 +9236,9 @@
 										// read grades.cvs from zip
 								        String result = StringUtil.trimToZero(readIntoString(zin));
 								        String[] lines=null;
-								        if (result.indexOf("\r") != -1)
+								        if (result.indexOf("\r\n") != -1)
+						        			lines = result.split("\r\n");
+								        else if (result.indexOf("\r") != -1)
 								        		lines = result.split("\r");
 								        else if (result.indexOf("\n") != -1)
 							        			lines = result.split("\n");