OSDN Git Service

Merge branch 'master' of https://github.com/fluxer/katie
authorIvailo Monev <xakepa10@gmail.com>
Wed, 8 Jun 2016 09:15:16 +0000 (12:15 +0300)
committerIvailo Monev <xakepa10@gmail.com>
Wed, 8 Jun 2016 09:15:16 +0000 (12:15 +0300)

Trivial merge