K 10 svn:author V 5 peter K 8 svn:date V 27 2013-11-11T01:00:29.342457Z K 7 svn:log V 77 Import svn-1.8.4, which includes fixes for both security and merge handling. END