Merge branch 'master' of /scm/spider
authorDirk Koopman <djk@tobit.co.uk>
Tue, 17 Jun 2014 19:51:35 +0000 (20:51 +0100)
committerDirk Koopman <djk@tobit.co.uk>
Tue, 17 Jun 2014 19:51:35 +0000 (20:51 +0100)

Trivial merge