as
Merge remote-tracking branch 'origin/master'

Conflicts:
	fuel/app/logs/2014/12/10.php