Merge branch 'master' of /scm/spider
authorDirk Koopman <djk@tobit.co.uk>
Fri, 13 Sep 2013 17:45:26 +0000 (18:45 +0100)
committerDirk Koopman <djk@tobit.co.uk>
Fri, 13 Sep 2013 17:45:26 +0000 (18:45 +0100)

Trivial merge