Merge branch 'master' of github.com:kudwafter/src
commit1e55ba07e1c35877bad849758dd61cc8db74ab0e
authorJiaqi Yang <kasuganosora@live.jp>
Tue, 4 Feb 2014 14:54:09 +0000 (4 22:54 +0800)
committerJiaqi Yang <kasuganosora@live.jp>
Tue, 4 Feb 2014 14:54:09 +0000 (4 22:54 +0800)
tree3177b44a3f101dfb8a73e145a65c2cf50e6fbd3d
parentdaca3244e5150afdab652b20194f7f01c9746d8f
parent2153f2c9bb4758d6d57609622443fe68e076c959
Merge branch 'master' of github.com:kudwafter/src

merged