From: Oleg Kostyuk <cub.uanic@gmail.com>
Date: Tue, 22 Apr 2014 22:47:47 +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=a26af7ca07d01bad87642684e648b0ce6b9961b8

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

a26af7ca07d01bad87642684e648b0ce6b9961b8