2 Commits (895bc327c39e9143cd7397691aca30a01c0952da)

Author	SHA1	Message	Date
Jack Humbert	547da78335	merging tmk	2015-10-27 12:42:30 -04:00
tmk	1a02ebcc61	Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core'	2015-04-10 01:32:04 +09:00