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

author yasushiito <yas@pen-chan.jp>

Wed, 4 Jun 2014 10:14:47 +0000 (19:14 +0900)

committer yasushiito <yas@pen-chan.jp>

Wed, 4 Jun 2014 10:14:47 +0000 (19:14 +0900)
author yasushiito <yas@pen-chan.jp>
Wed, 4 Jun 2014 10:14:47 +0000 (19:14 +0900)
committer yasushiito <yas@pen-chan.jp>
Wed, 4 Jun 2014 10:14:47 +0000 (19:14 +0900)
diff --cc app/assets/javascripts/manifest/work/items.js.coffee.erb
Simple merge
diff --cc public/manifest.json
Simple merge
author	yasushiito <yas@pen-chan.jp>
	Wed, 4 Jun 2014 10:14:47 +0000 (19:14 +0900)
committer	yasushiito <yas@pen-chan.jp>
	Wed, 4 Jun 2014 10:14:47 +0000 (19:14 +0900)
		1	2
app/assets/javascripts/manifest/work/items.js.coffee.erb	patch \|	diff1 \|	diff2 \|	blob \| history
public/manifest.json	patch \|	diff1 \|	diff2 \|	blob \| history