Merge remote-tracking branch 'origin/master'
authorKoichi Kamichi <kamichi@ic.daito.ac.jp>
Mon, 11 Jan 2016 15:43:30 +0000 (00:43 +0900)
committerKoichi Kamichi <kamichi@ic.daito.ac.jp>
Mon, 11 Jan 2016 15:43:30 +0000 (00:43 +0900)
commitb16071050e7e9f1dc247684b2454105592f754ff
tree0a91d234ef9be1cd1981db72f10fce536f9831b0
parentc0327545cf43552214a60fb03c086b4fa54e716f
parent2d3e1d1725346662edb74814e8f7919acfe845fd
Merge remote-tracking branch 'origin/master'