Merge branch 'ts'
authorShaverdova Elena <eshaverdova@gmail.com>
Thu, 24 May 2012 15:20:46 +0000 (19:20 +0400)
committerShaverdova Elena <eshaverdova@gmail.com>
Thu, 24 May 2012 15:20:46 +0000 (19:20 +0400)
commit8dfeb3f83cdd4bac19e34b4d0fb8e0476ea92c13
treeca0b32d3a53d9c2e52aabf84e7b417e1cfeda9c6
parentf9a25a44b56d6afc75bb723f9088d781515f84bf
parentbb171a35ec03725c1f5aa030873c43145a4fb5c8
Merge branch 'ts'