OSDN Git Service

clear conflict
authoryasushiito <yasushiito@git.sourceforge.jp>
Mon, 26 Mar 2012 23:59:35 +0000 (08:59 +0900)
committeryasushiito <yasushiito@git.sourceforge.jp>
Mon, 26 Mar 2012 23:59:35 +0000 (08:59 +0900)

Trivial merge