Merge branch 'integration' into dev
authorkhizmax <khizmax@gmail.com>
Mon, 30 Mar 2015 11:38:59 +0000 (14:38 +0300)
committerkhizmax <khizmax@gmail.com>
Mon, 30 Mar 2015 11:38:59 +0000 (14:38 +0300)
commit357509b3ac41bb8a7c86678f982a9c6f4b5c1910
tree984fc8f1dae0d2f73e0c4b4ccf59a4017cac4eb5
parentee5d998040790b4531973af44d2cd1931ebb3ad1
parent27821929a042f2f7e4e97c97ede7e07230bf8336
Merge branch 'integration' into dev