Merge branch 'dev'
authorkhizmax <khizmax@gmail.com>
Fri, 5 Dec 2014 15:24:00 +0000 (18:24 +0300)
committerkhizmax <khizmax@gmail.com>
Fri, 5 Dec 2014 15:24:00 +0000 (18:24 +0300)
commitf475900fca515172695b5fc876cf71db3cff5200
treeef0b4eb21554a3de6a463d4e717d8ef256f0a9a0
parent4797a60c31abac744145cd19daea0faec092855f
parentdcd368b0fbb3cb8877b21ea8425ceb617fb0d7df
Merge branch 'dev'