Merge branch 'master' into eterhack
authorVitaly Lipatov <lav@etersoft.ru>
Mon, 5 May 2008 20:06:03 +0000 (00:06 +0400)
committerVitaly Lipatov <lav@etersoft.ru>
Mon, 5 May 2008 20:06:03 +0000 (00:06 +0400)
commit95aa1b4d04f7e4d8e7ed215234dac1b86c4fe62d
treecab93408a70017e7c09931fbe3943097a1681010
parent2aceb7808305d7cc84a3b5457640e6dc14674efe
parent5627580902a3f25bf3674e00c97c400328283305
Merge branch 'master' into eterhack