2 commits

Author	SHA1	Message	Date
Jun Wako	79cfa894af	Merge commit 'a20ef7052c6e937d2f7672dd59456e55a5c08296' into master_ng	2015-04-22 13:29:13 +09:00
tmk	1a02ebcc61	Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core'	2015-04-10 01:32:04 +09:00