ブランチ「label-local」をマージ
authorj8takagi <j8takagi@nifty.com>
Tue, 2 Feb 2010 12:00:51 +0000 (21:00 +0900)
committerj8takagi <j8takagi@nifty.com>
Tue, 2 Feb 2010 12:03:03 +0000 (21:03 +0900)
Conflicts:
test/unit/.gitignore(両者を追加)


Trivial merge