From: Oleg Kostyuk <cub.uanic@gmail.com>
Date: Sun, 30 Mar 2014 02:49:58 +0000 (+0300)
Subject: Merge remote-tracking branch 'tmk/master' into cub_layout
X-Git-Url: https://git.donarmstrong.com/?p=tmk_firmware.git;a=commitdiff_plain;h=57c6b597ead6a98ddaade97d66de55928a4fb2a2

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

57c6b597ead6a98ddaade97d66de55928a4fb2a2