From: Adam Dickmeiss Date: Tue, 9 Aug 2011 13:37:04 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/simpleserver X-Git-Tag: v1.14~2 X-Git-Url: http://jsfdemo.indexdata.com/?a=commitdiff_plain;h=cbe451c7d79eeae5bd0ccd5fe7e34ae8723ef80e;p=simpleserver-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/simpleserver --- cbe451c7d79eeae5bd0ccd5fe7e34ae8723ef80e