Merge branch 'master' of tsn:public_html/git/elliptics