From: Oleg Kostyuk <cub.uanic@gmail.com>
Date: Fri, 2 Jan 2015 21:55:55 +0000 (+0200)
Subject: Merge remote-tracking branch 'tmk/master' into cub_layout
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=77815a2959c11c0c8e78d2fd3b67fa1242b5e26a;p=tmk_firmware.git

Merge remote-tracking branch 'tmk/master' into cub_layout
---

77815a2959c11c0c8e78d2fd3b67fa1242b5e26a