OSDN Git Service

Merge branch 'master' into dev
authorscribu <mail@scribu.net>
Sat, 8 Jun 2013 13:46:57 +0000 (16:46 +0300)
committerscribu <mail@scribu.net>
Sat, 8 Jun 2013 13:46:57 +0000 (16:46 +0300)

Trivial merge