Merge branch 'master' of /scm/spider
authorDirk Koopman <djk@tobit.co.uk>
Thu, 12 Sep 2013 12:40:58 +0000 (13:40 +0100)
committerDirk Koopman <djk@tobit.co.uk>
Thu, 12 Sep 2013 12:40:58 +0000 (13:40 +0100)

Trivial merge