Commit from Mozilla Verbatim by user channy@mozilla.or.kr.: 3246 of 3357 strings translated (0 fuzzy).
Merge branch 'master' of github.com:mozilla/olympia
Adding more log to be able to fix bug 997706
Merge branch 'master' of github.com:mozilla/olympia
Merge branch 'master' of github.com:mozilla/olympia

Conflicts:
	lib/es/tests/test_commands.py
Merge branch 'master' of github.com:mozilla/olympia
Merge branch 'master' of github.com:mozilla/olympia