Squashed commit of the following:

commit f29ccd84896d47c75a2901882d282c5c58be037b
Merge: 23e9f86 cd87021
Author: Akira Koyasu <mail@akirakoyasu.net>
Date:   Sun Nov 10 02:20:30 2013 +0900

    Merge branch 'master' into develop

commit 23e9f864d7f7381b207a9ff7c18dfd55163f13d8
Author: Akira Koyasu <mail@akirakoyasu.net>
Date:   Sun Nov 10 02:19:35 2013 +0900

    test1

commit cd87021be756503abe6319e714a1896998189e7e
Merge: ba6cc8d de3cede
Author: Akira Koyasu <mail@akirakoyasu.net>
Date:   Sun Nov 10 02:18:20 2013 +0900

    Merge branch 'merge-child'

commit de3cedeebd7b0d6462fa4d44e6b053e8ba255839
Author: Akira Koyasu <mail@akirakoyasu.net>
Date:   Sun Nov 10 02:12:40 2013 +0900

    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

commit dfe5afc0ca2e6dd20b2036c1a810e5c9146a0c9c
Author: Akira Koyasu <mail@akirakoyasu.net>
Date:   Sun Nov 10 01:58:32 2013 +0900

    test

commit e764e5e19da004fc94ae49f64652a10ec8f5e6f1
Author: Akira Koyasu <mail@akirakoyasu.net>
Date:   Sun Nov 10 01:52:15 2013 +0900

    aaaa

commit 3517fcffc044c77e1f8b98b1e1e28bbb67c909c7
Author: Akira Koyasu <mail@akirakoyasu.net>
Date:   Sun Nov 10 01:47:26 2013 +0900

    Squashed commit of the following:

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

        first commit

commit ba6cc8da9a0edad6a83a62771eb8e013d19169dd
Author: Akira Koyasu <mail@akirakoyasu.net>
Date:   Sun Nov 10 01:37:09 2013 +0900

    first commit