Merge branch 'master' into eterhack
authorVitaly Lipatov <lav@etersoft.ru>
Mon, 5 May 2008 07:30:16 +0000 (11:30 +0400)
committerVitaly Lipatov <lav@etersoft.ru>
Mon, 5 May 2008 07:30:16 +0000 (11:30 +0400)
commit68166abde71429538f045956774262383b9498d3
tree82d86fc9767413c840d94d09d5caeca019e2d69c
parent023ae20796fbebbdb9d1e4cac38adc820a5ab8d2
parentfff42ae028dc5b8c0b8fb4ea4ba39ad7b797ccc6
Merge branch 'master' into eterhack

Conflicts:

etersoft/release_current.sh