Merge branch 'master' of github.com:sharelatex/clsi-sharelatex

This commit is contained in:
James Allen 2014-08-19 12:14:38 +01:00
commit 995d23a326