Merge branch 'develop'
authorAlex Kamedov <alex@kamedov.ru>
Wed, 27 Apr 2011 16:13:24 +0000 (22:13 +0600)
committerAlex Kamedov <alex@kamedov.ru>
Wed, 27 Apr 2011 16:13:24 +0000 (22:13 +0600)
commit0ea3daef05a6126e6429d37d9706aef785104802
tree8b7fd7d18856c2a3cb90d666c5d99b6d09b7867b
parentfdd4b59a0a825cf8fa38e94123d118b57707b067
parentbb0f2e097212e1213fe2dc3661e3da63cc5cbe16
Merge branch 'develop'