From: Dirk Koopman <djk@tobit.co.uk>
Date: Mon, 25 Jul 2016 15:44:47 +0000 (+0100)
Subject: Merge branch 'mojo' of /scm/spider into mojo
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?p=spider.git;a=commitdiff_plain;h=279b963d65945d5f0f9e8bdabe38045ec9568789

Merge branch 'mojo' of /scm/spider into mojo

Conflicts:
	Changes
---

279b963d65945d5f0f9e8bdabe38045ec9568789
diff --cc Changes
index 4a765bd1,e1964270..0b307ae2
--- a/Changes
+++ b/Changes
@@@ -1,5 -1,8 +1,10 @@@
+ 25Jul16=======================================================================
+ 1. Add some timing stats to cmd spawn_cmd.
+ 08Jul16=======================================================================
+ 1. Add latest wpxloc.raw
+ 2. Add CTY-2609
 +28Mar16=======================================================================
 +1. Fix get/keps.pl so that it does the right fetch
  25Mar16=======================================================================
  1. Rework DXCron::spawn command to use Mojo::IOLoop::ForkCall
  04Jan16=======================================================================