packages/orm/model/*.html 翻訳中
Merge branch 'trans_orm_model' of https://github.com/sharkpp/FuelPHP_docs_jp into 1.8/develop_japanese
Add smtp.starttls config.

See https://github.com/fuel/email/issues/55
Merge pull request #639 from kenjis/update_email

Add smtp.starttls config, and some fixes
Update CREDITS.md
Merge pull request #547 from yukku0423/patch-1

Update CREDITS.md
Merge pull request #548 from yukku0423/1.8/develop_japanese

Theme 高度な使い方 翻訳
Merge branch '1.8/develop_japanese' of https://github.com/NEKOGET/FuelPHP_docs_jp into 1.8/develop_japanese
packages/orm/model/temporal.html を翻訳中
packages/orm/model/temporal.html を翻訳中
packages/orm/model/temporal.html 翻訳中
packages/orm/model/temporal.html の使用法を翻訳
Merge pull request #549 from sharkpp/trans_orm_model

packages/orm/model/*.html 翻訳中
classes/format.html 翻訳完了
行数を合わせる
Merge branch '1.8/develop' into upstream-1.8-merge

Conflicts:
	packages/email/introduction.html
Merge pull request #550 from kenjis/trans_format

classes/format.html 翻訳完了
Merge pull request #551 from kenjis/fix_line

行数を合わせる
Merge pull request #552 from kenjis/upstream-1.8-merge

本家 1.8/develop をマージ
packages/orm/model/temporal.html を翻訳