Merge branch 'master' of /scm/spider
authorDirk Koopman <djk@tobit.co.uk>
Wed, 11 Sep 2013 15:18:28 +0000 (16:18 +0100)
committerDirk Koopman <djk@tobit.co.uk>
Wed, 11 Sep 2013 15:18:28 +0000 (16:18 +0100)

Trivial merge