OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Sun, 12 Jul 2015 10:19:27 +0000 (19:19 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Sun, 12 Jul 2015 10:19:27 +0000 (19:19 +0900)
commit188bd25be40ed84c48e06bef8d9c0d5811fa8ab9
treee09e0edaa4309474f9738f54d33393d7d87677f1
parent2a7ec5f349789e87c54899b90ed70738b2076647
parentdf099babbca38e17efd82f07f87929a74997f221
Merge with stable