tree 3e7559fd03e759e6cf7808d9f281326bac057fa6
parent 41b546deee9f1ed99f3820de5a2014b2d74a0c94
parent 286f9e1ae17188562d5f42c197709b547b90596e
author Andrey Andreev <narf@devilix.net> 1412553696 +0300
committer Andrey Andreev <narf@devilix.net> 1412553696 +0300

Merge branch 'develop' into feature/session