Merge branch 'master' of /scm/spider
authorDirk Koopman <djk@tobit.co.uk>
Tue, 31 Dec 2013 18:35:38 +0000 (18:35 +0000)
committerDirk Koopman <djk@tobit.co.uk>
Tue, 31 Dec 2013 18:35:38 +0000 (18:35 +0000)

Trivial merge