anthias.home.ru: Wed Nov 19 14:27:08 MSK 2014
anthias.home.ru: Wed Nov 19 14:39:36 MSK 2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	cli.pro.user.3.2-pre1