Add braces around single-line conditionals. See http://make.wordpress.org/core/2013/11/13/proposed-coding-standards-change-always-require-braces/.
Fixed typo in inline comments.
Merge pull request #347 from taupecat/upstream

_s: Fix spelling in inline comments.
Merge remote-tracking branch 'upstream/master' into ja

* upstream/master:
  Fixed typo in inline comments.
Removed bullet that referenced keyboard-image-navigation.js, since that file was deleted.
Merge pull request #349 from taupecat/upstream

_s: Remove reference to keyboard-image-navigation.js. That file doesn't exist anymore.
_s: Use verbose syntax for conditionals in templates.
Merge pull request #343 from Automattic/add-braces

_s: Add braces around single-line conditionals.
_s: Update wpcom compat file to wrap contents in a hooked callback.
_s: Split navigation template tag in context-specific tags.
Merge remote-tracking branch 'upstream/master' into ja

* upstream/master:
  _s: Split navigation template tag in context-specific tags.
  _s: Update wpcom compat file to wrap contents in a hooked callback.
  _s: Use verbose syntax for conditionals in templates.
  Removed bullet that referenced keyboard-image-navigation.js, since that file was deleted.
  Add braces around single-line conditionals. See http://make.wordpress.org/core/2013/11/13/proposed-coding-standards-change-always-require-braces/.
コミット[3f4effb] までの翻訳反映
Merge remote-tracking branch 'upstream/ja'

* upstream/ja:
  コミット[3f4effb] までの翻訳反映
  _s: Split navigation template tag in context-specific tags.
  _s: Update wpcom compat file to wrap contents in a hooked callback.
  _s: Use verbose syntax for conditionals in templates.
  Removed bullet that referenced keyboard-image-navigation.js, since that file was deleted.
  Fixed typo in inline comments.
  Add braces around single-line conditionals. See http://make.wordpress.org/core/2013/11/13/proposed-coding-standards-change-always-require-braces/.

Conflicts:
	style.css