Merge branch 'integration' into dev
authorkhizmax <khizmax@gmail.com>
Fri, 3 Apr 2015 13:04:34 +0000 (16:04 +0300)
committerkhizmax <khizmax@gmail.com>
Fri, 3 Apr 2015 13:04:34 +0000 (16:04 +0300)
commit7a9b165a36a347f447afcc763ad810151490c876
treeb2abc980ecdbf4c689718ec89e56749cf9ee5152
parent15ebecff061b3655e272e0c2a9f3c33117fbb9fd
parentdd5e338572a0371e42c373e0ba3557a863602404
Merge branch 'integration' into dev