OSDN Git Service

Merge branch 'master' of https://github.com/fluxer/katie
authorIvailo Monev <xakepa10@gmail.com>
Mon, 20 Jun 2016 22:26:09 +0000 (22:26 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Mon, 20 Jun 2016 22:26:09 +0000 (22:26 +0000)

Trivial merge