OSDN Git Service

Merge branch 'develop' master 0.9.1
authorsuikan <suikan@users.sourceforge.jp>
Sun, 18 Oct 2015 01:23:14 +0000 (10:23 +0900)
committersuikan <suikan@users.sourceforge.jp>
Sun, 18 Oct 2015 01:23:14 +0000 (10:23 +0900)
Conflicts:
hirado/CHANGES


Trivial merge