Merge branch 'master' into eterhack
authorVitaly Lipatov <lav@etersoft.ru>
Mon, 5 May 2008 20:08:54 +0000 (00:08 +0400)
committerVitaly Lipatov <lav@etersoft.ru>
Mon, 5 May 2008 20:08:54 +0000 (00:08 +0400)
commitbbda57a8afcbe55bcbc67a3ccc794ca0724b191b
treea09ae89ed06e8dcdcc5f92c51853221f4317480c
parent95aa1b4d04f7e4d8e7ed215234dac1b86c4fe62d
parent926166f9e01d83e75d9a31b36ef4bfa70ee6ae61
Merge branch 'master' into eterhack