Merge branch 'mojo' of ssh://server/scm/spider into mojo
authorDirk Koopman <djk@tobit.co.uk>
Tue, 17 Jun 2014 20:41:03 +0000 (21:41 +0100)
committerDirk Koopman <djk@tobit.co.uk>
Tue, 17 Jun 2014 20:41:03 +0000 (21:41 +0100)

Trivial merge