OSDN Git Service

Merge remote-tracking branch 'upstream/master'
authorJonathan Campbell <jonathan@castus.tv>
Fri, 21 Oct 2016 19:10:17 +0000 (12:10 -0700)
committerJonathan Campbell <jonathan@castus.tv>
Fri, 21 Oct 2016 19:10:17 +0000 (12:10 -0700)
commitfb97121f7d0be4408d8e2ed98a2f7b10b852a915
treed78df499f8fbe41be2661a294c411a0b3798ce6d
parent631d2bde47de81ead5300f7aca378447387f254c
parentd6f4d6055ab7da24dd416e4161bef5ea5662a170
Merge remote-tracking branch 'upstream/master'