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

author yasushiito <yas@pen-chan.jp>

Tue, 10 Jun 2014 08:59:05 +0000 (17:59 +0900)

committer yasushiito <yas@pen-chan.jp>

Tue, 10 Jun 2014 08:59:05 +0000 (17:59 +0900)
author yasushiito <yas@pen-chan.jp>
Tue, 10 Jun 2014 08:59:05 +0000 (17:59 +0900)
committer yasushiito <yas@pen-chan.jp>
Tue, 10 Jun 2014 08:59:05 +0000 (17:59 +0900)
diff --cc app/models/balloon.rb
Simple merge
diff --cc app/models/speech.rb
Simple merge
author	yasushiito <yas@pen-chan.jp>
	Tue, 10 Jun 2014 08:59:05 +0000 (17:59 +0900)
committer	yasushiito <yas@pen-chan.jp>
	Tue, 10 Jun 2014 08:59:05 +0000 (17:59 +0900)
		1	2
app/models/balloon.rb	patch \|	diff1 \|	diff2 \|	blob \| history
app/models/speech.rb	patch \|	diff1 \|	diff2 \|	blob \| history