From: Oleg Kostyuk <cub.uanic@gmail.com>
Date: Tue, 1 Jul 2014 10:17:09 +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=0a4cc0db3191200819b8cda5481b5cf387b00a2f

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

0a4cc0db3191200819b8cda5481b5cf387b00a2f