Merge branch 'dev' master
authordev <dev@fmaj7b5.info>
Mon, 1 Jul 2013 10:09:05 +0000 (19:09 +0900)
committerdev <dev@fmaj7b5.info>
Mon, 1 Jul 2013 10:09:05 +0000 (19:09 +0900)

Trivial merge