From: Oleg Kostyuk <cub.uanic@gmail.com>
Date: Thu, 18 Dec 2014 01:34:34 +0000 (+0200)
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=c5d3988e7ace6a7c940f543ab2539be8ef15bd7d

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

c5d3988e7ace6a7c940f543ab2539be8ef15bd7d