From: Mike Taylor Date: Tue, 9 Aug 2011 10:26:02 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/simpleserver X-Git-Tag: v1.14~2^2~1 X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=commitdiff_plain;h=afd03c78d168aa80b3bb2b944be21346c4db765b Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/simpleserver --- afd03c78d168aa80b3bb2b944be21346c4db765b