# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1196975496 28800
# Node ID 6e1a61b14bbfa31c8b0af7737b7f9700c3b4a75e
# Parent  88ca3e0fb6e5201731532db7ddcf289913ca143e# Parent  924fd86f0579fddced59871d6a8459b60d5e5781
Merge with stable

diff -r 88ca3e0fb6e5 -r 6e1a61b14bbf hgext/convert/subversion.py
--- a/hgext/convert/subversion.py	Wed Dec 05 12:48:33 2007 +0100
+++ b/hgext/convert/subversion.py	Thu Dec 06 13:11:36 2007 -0800
@@ -610,7 +610,7 @@
             # Example SVN datetime. Includes microseconds.
             # ISO-8601 conformant
             # '2007-01-04T17:35:00.902377Z'
-            date = util.parsedate(date[:18] + " UTC", ["%Y-%m-%dT%H:%M:%S"])
+            date = util.parsedate(date[:19] + " UTC", ["%Y-%m-%dT%H:%M:%S"])
 
             log = message and self.recode(message)
             author = author and self.recode(author) or ''