From: Vitaly Lipatov <lav@etersoft.ru>
Date: Thu, 11 Mar 2010 19:25:58 +0000 (+0300)
Subject: Merge branch 'eter-1.0.12' of git.office:/projects/eterhack into eter-1.0.12
X-Git-Tag: 1.0.12-alt4~3
X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=512d756e6978bfd95aec0dc480c5a438bda2dc08;p=wine%2Feterwine.git

Merge branch 'eter-1.0.12' of git.office:/projects/eterhack into eter-1.0.12

Conflicts:
	etersoft/scripts/wine.in
---

512d756e6978bfd95aec0dc480c5a438bda2dc08