]> git.donarmstrong.com Git - tmk_firmware.git/commitdiff
Merge branch 'locking_caps'
authortmk <nobody@nowhere>
Tue, 12 Mar 2013 01:49:59 +0000 (10:49 +0900)
committertmk <nobody@nowhere>
Tue, 12 Mar 2013 01:49:59 +0000 (10:49 +0900)

Trivial merge