From: hayashi Date: Sat, 7 Jun 2014 14:16:36 +0000 (+0900) Subject: Merge branch 'bus_route' of git.sourceforge.jp:/gitroot/convbusstop/convbusstop.git... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c9550994c5853d9bad6dd4ca26df64cf02faab9a;p=convbusstop%2Fconvbusstop.git Merge branch 'bus_route' of git.sourceforge.jp:/gitroot/convbusstop/convbusstop.git into bus_route --- c9550994c5853d9bad6dd4ca26df64cf02faab9a