Merge branch 'hotfix/20140720_3' into develop
add aaaaa.txt
add bbbb.txt
apend text aaaa.txt
Merge branch 'feature/abc' into develop
add aaaa.txt
add bbbb.txt
Merge branch 'feature/def' into develop
add aaaaa.txt
add bbbb.txt
add aaaa.txt bbbb.txt
add feature/aaa
add dev/aaaa.txt
add feature/zzz
Merge branch 'release/1.0.0'