Merge branch 'next' master
authorHideki Saito <hideki@hidekisaito.com>
Mon, 12 Oct 2015 09:38:32 +0000 (02:38 -0700)
committerHideki Saito <hideki@hidekisaito.com>
Mon, 12 Oct 2015 09:38:32 +0000 (02:38 -0700)
commitbaa5a2ed026164ece955f166afe7e2ee0e4877cb
tree512117c133e96e03144658c655d80211872951bc
parent4e09e06099454730ca64a4d5d0e06a36aaed7449
parent5542d4342bc1334e8f330e068879da9966bfd057
Merge branch 'next'