Merge branch 'master' of /scm/spider
authorDirk Koopman <djk@tobit.co.uk>
Sat, 8 Mar 2014 00:44:26 +0000 (00:44 +0000)
committerDirk Koopman <djk@tobit.co.uk>
Sat, 8 Mar 2014 00:44:26 +0000 (00:44 +0000)

Trivial merge