Merge branch 'develop'
authorAlex Kamedov <alex@kamedov.ru>
Sun, 24 Apr 2011 15:26:33 +0000 (21:26 +0600)
committerAlex Kamedov <alex@kamedov.ru>
Sun, 24 Apr 2011 15:26:33 +0000 (21:26 +0600)
commit73bfc6b53448f5f1d10d9b3f58f2cf4f3756be41
tree2deacfd4867e918d706b59262385161551378e57
parent34cdae232d0d9a1b26133b7dd39ab484243d6493
parent4d08fe00954d5a4a3a5d963ff04d001be57f9007
Merge branch 'develop'