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

author yasushiito <yas@pen-chan.jp>

Wed, 12 Dec 2012 23:18:39 +0000 (08:18 +0900)

committer yasushiito <yas@pen-chan.jp>

Wed, 12 Dec 2012 23:18:39 +0000 (08:18 +0900)
author yasushiito <yas@pen-chan.jp>
Wed, 12 Dec 2012 23:18:39 +0000 (08:18 +0900)
committer yasushiito <yas@pen-chan.jp>
Wed, 12 Dec 2012 23:18:39 +0000 (08:18 +0900)
diff --cc config/locales/pettanr.ja.yml
Simple merge
diff --cc config/routes.rb
Simple merge
author	yasushiito <yas@pen-chan.jp>
	Wed, 12 Dec 2012 23:18:39 +0000 (08:18 +0900)
committer	yasushiito <yas@pen-chan.jp>
	Wed, 12 Dec 2012 23:18:39 +0000 (08:18 +0900)
		1	2
config/locales/pettanr.ja.yml	patch \|	diff1 \|	diff2 \|	blob \| history
config/routes.rb	patch \|	diff1 \|	diff2 \|	blob \| history