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

_s: Fix spelling 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.
List for main-navigation

Hey guys, I am proposing to remove li in front of the current_page_item and current-menu-item. It's slightly more efficient without and of course all works the same :)
Merge pull request #351 from emiluzelac/patch-7

List for main-navigation
Make date formats translatable

Following up on a similar change to 2014, make the date formats for monthly and yearly archives translatable.
Merge pull request #352 from sabreuse/patch-1

_s: Make date formats translatable.
_s: Add closing brackets to avoid fatal error. Props @gatespace for
intial patch. Fixes #355.
Fixed Issue #354: Removed link on line 90 that was going to a page that no longer exists.
Merge pull request #357 from elimc/master

_s: Remove dead link. Fixes #354.
Merge branch 'upstream'

Conflicts:
	style.css
Merge branch 'master' into customized