Merge branch 'fifteen'
authortanya <tanya@moshkanov.oblgaz>
Thu, 2 Sep 2010 19:51:22 +0000 (22:51 +0300)
committertanya <tanya@moshkanov.oblgaz>
Thu, 2 Sep 2010 19:51:22 +0000 (22:51 +0300)
commitd3b74f221611a10f712826d06d8678691bb50764
tree80949e542ae7b6146da9e0dfa97ed7402558e333
parent3d2fecae142db769d75110de003cc5e1cff2b7bd
parent1d8a2497850de26700d69e21b7ad962aaa9d9476
Merge branch 'fifteen'