From: tmk <hasu@tmk-kbd.com>
Date: Fri, 12 Feb 2016 05:38:49 +0000 (+0900)
Subject: Merge commit '5a0132f1c1c9a14fd2941f0a5e29bbf5e31da20c' into master-core-pull
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=83a3de38b710d0eb5a752ffded6da2e8bf818b22;p=max%2Ftmk_keyboard.git

Merge commit '5a0132f1c1c9a14fd2941f0a5e29bbf5e31da20c' into master-core-pull
---

83a3de38b710d0eb5a752ffded6da2e8bf818b22