OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Sat, 29 Nov 2014 08:44:05 +0000 (17:44 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Sat, 29 Nov 2014 08:44:05 +0000 (17:44 +0900)
commit50c3a4ae6a4768a37b5f4fca50d34b9aa2923274
treea128d8bf6d801756c2c9a44e9d36a69cba245567
parent6d5082b69cb5315c246cd3a7350bf35c853fd79e
parentad4f3d5926a235901327eae83070dba52354d69f
Merge with stable