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)

Trivial merge