OSDN Git Service

Merge branch 'proxy'
authoryukihane <yukihane.feather@gmail.com>
Tue, 20 Sep 2011 07:49:30 +0000 (16:49 +0900)
committeryukihane <yukihane.feather@gmail.com>
Tue, 20 Sep 2011 07:49:30 +0000 (16:49 +0900)
commitf1bd2894bf8b4f760fff8a4a1d9b5837b379cd88
tree535825aeb97be5309ad7a183b2cd285e3caabf9f
parentcaaab8987f6c3a141760fb706f61395bb4bf6c1a
parent33615dcb685ffc4ab4d062828b3a14f5051c63aa
Merge branch 'proxy'