Merge branch 'eter-1.0.12' of git.office:/projects/eterhack into eter-1.0.12
authorVitaly Lipatov <lav@etersoft.ru>
Thu, 11 Mar 2010 19:25:58 +0000 (22:25 +0300)
committerVitaly Lipatov <lav@etersoft.ru>
Thu, 11 Mar 2010 19:25:58 +0000 (22:25 +0300)
Conflicts:
etersoft/scripts/wine.in


Trivial merge