Merge branch 'master' into testing

This commit is contained in:
Matt Wells 2013-11-15 14:47:35 -07:00
commit f43b7dca13

@ -8915,6 +8915,7 @@ XmlDoc **XmlDoc::getOldXmlDoc ( ) {
m_coll ,
NULL , // pbuf
m_niceness ) ) {
log("build: failed to set old doc for %s",m_firstUrl.m_url);
if ( ! g_errno ) { char *xx=NULL;*xx=0; }
return NULL;
}