tree e6b2c26380a8309371497a7eb88cb9c907316a12
parent 69ebaa4b4ff75bf586a849d57d3774d37b2a2068
parent 57eff9110967c3314c95a39f1863f1532e4028a9
author Max Klyus <xmaruto@gmail.com> 1462268365 -0700
committer Max Klyus <xmaruto@gmail.com> 1462268365 -0700

final merging with master branch