Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

author yasushiito <yas@pen-chan.jp>

Tue, 2 Sep 2014 07:08:39 +0000 (16:08 +0900)

committer yasushiito <yas@pen-chan.jp>

Tue, 2 Sep 2014 07:08:39 +0000 (16:08 +0900)
author yasushiito <yas@pen-chan.jp>
Tue, 2 Sep 2014 07:08:39 +0000 (16:08 +0900)
committer yasushiito <yas@pen-chan.jp>
Tue, 2 Sep 2014 07:08:39 +0000 (16:08 +0900)
diff --cc app/assets/javascripts/pettanr.js.coffee
Simple merge
diff --cc app/views/top/index.html.erb
Simple merge
author	yasushiito <yas@pen-chan.jp>
	Tue, 2 Sep 2014 07:08:39 +0000 (16:08 +0900)
committer	yasushiito <yas@pen-chan.jp>
	Tue, 2 Sep 2014 07:08:39 +0000 (16:08 +0900)
		1	2
app/assets/javascripts/pettanr.js.coffee	patch \|	diff1 \|	diff2 \|	blob \| history
app/views/top/index.html.erb	patch \|	diff1 \|	diff2 \|	blob \| history