Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 13 Oct 2017 16:34:53 +0000 (01:34 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 13 Oct 2017 16:34:53 +0000 (01:34 +0900)
commita81931559c9509bcead3376e2e3fb4ed7f28d635
treeedb8851dbf44be70cd3c419b37f3140e661fecc2
parentb9792780de7a5cff9fc96156e883f53c15fb28a8
parent63054e450c8a2d25195333945a1c5b068557196f
Merge branch 'master' into single-inheritance