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

author yasushiito <yas@pen-chan.jp>

Sun, 5 Oct 2014 01:37:29 +0000 (10:37 +0900)

committer yasushiito <yas@pen-chan.jp>

Sun, 5 Oct 2014 01:37:29 +0000 (10:37 +0900)
author yasushiito <yas@pen-chan.jp>
Sun, 5 Oct 2014 01:37:29 +0000 (10:37 +0900)
committer yasushiito <yas@pen-chan.jp>
Sun, 5 Oct 2014 01:37:29 +0000 (10:37 +0900)
diff --cc app/assets/javascripts/models/ground_picture.js.coffee
Simple merge
diff --cc app/assets/javascripts/models/picture.js.coffee
Simple merge
author	yasushiito <yas@pen-chan.jp>
	Sun, 5 Oct 2014 01:37:29 +0000 (10:37 +0900)
committer	yasushiito <yas@pen-chan.jp>
	Sun, 5 Oct 2014 01:37:29 +0000 (10:37 +0900)
		1	2
app/assets/javascripts/models/ground_picture.js.coffee	patch \|	diff1 \|	diff2 \|	blob \| history
app/assets/javascripts/models/picture.js.coffee	patch \|	diff1 \|	diff2 \|	blob \| history