3 commits

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