Merge branch 'develop'
authorAlex Kamedov <alex@kamedov.ru>
Wed, 27 Apr 2011 14:49:43 +0000 (20:49 +0600)
committerAlex Kamedov <alex@kamedov.ru>
Wed, 27 Apr 2011 14:49:43 +0000 (20:49 +0600)
commitfdd4b59a0a825cf8fa38e94123d118b57707b067
treed349549e1a4c98d3ab6c2e436ed6ba547bb388cc
parent73bfc6b53448f5f1d10d9b3f58f2cf4f3756be41
parentf8a6477e0cf670ed665c862f5d63490280f7df66
Merge branch 'develop'