Merge branch 'master' of /scm/spider
authorDirk Koopman <djk@tobit.co.uk>
Fri, 7 Mar 2014 23:37:07 +0000 (23:37 +0000)
committerDirk Koopman <djk@tobit.co.uk>
Fri, 7 Mar 2014 23:37:07 +0000 (23:37 +0000)

Trivial merge