aaaa
Squashed commit of the following:

commit 2f1f4f446aa91adb4834f13f8066ffb100c7c0fc
Author: Akira Koyasu <mail@akirakoyasu.net>
Date:   Sun Nov 10 02:03:28 2013 +0900

    test5

commit ed411537fccf881b5fccbb095b23890301f8fbd3
Author: Akira Koyasu <mail@akirakoyasu.net>
Date:   Sun Nov 10 01:41:27 2013 +0900

    first commit
Merge branch 'merge-child'
Merge branch 'master' into develop