Public Git Hosting - for-me-and-for-all

commit	2c8dddc6a6eb638cb90e8c29e0a71361670a74f1
author	Ivan Zakharyaschev <imz@altlinux.org>
	Wed, 4 May 2011 16:59:57 +0000 (4 16:59 +0000)
committer	Ivan Zakharyaschev <imz@altlinux.org>
	Wed, 4 May 2011 16:59:57 +0000 (4 16:59 +0000)
tree	1b64ff73c9f042cae3aaad0ea9fbb939eb4393b4	tree \| snapshot (tar.gz zip)
parent	167a10747a0ffc5eb10e328bb5f4e0c028745630	commit \| diff
parent	2582ec097e48ba94fe7b07d620b93b20d6627c4b	commit \| diff

Merge commit 'scalar-implicatures-inference/beautified-after-FFeed' into VIEW/scalar-implicatures-inference/LATEST

For me and for all. (Notes and other stuff.)