Merge branch 'master' into eterhack
authorVitaly Lipatov <lav@etersoft.ru>
Mon, 28 Apr 2008 16:31:28 +0000 (20:31 +0400)
committerVitaly Lipatov <lav@etersoft.ru>
Mon, 28 Apr 2008 16:31:28 +0000 (20:31 +0400)
commit95e95314a05a1d68ccf3ffc86d1184d669528c1d
tree900383d382945f2dc3b7be6749028d1255c38e8a
parent77e34ddaded1fb7ff0d1479ad4c1bd9e57e6b63a
parent7da96e330a3c46958e48f19cc72dc69ffa78d440
Merge branch 'master' into eterhack