Remove unnecessary div in googleplus_helper.tmpl
style fixes
Merge branch 'master' of github.com:ralsina/nikola
DOC: Add url for authorship verification for G+.

Closes #635
Update tipuesearch to the latest version.
Merge pull request #637 from punchagan/gplus-comments

DOC: Add url for authorship verification for G+.
Make bootswatch work for bootstrap 2 and 3 (#599)
Merge branch 'master' of github.com:ralsina/nikola
Fix duplicated name (#638)
Fix #640
was using wrong glob for LESS dependencies
Fix #614
Perparing 6.0.0 beta1
Facebook comments support!

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
Document upgrading to v6

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
moving a few facebook things around

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
Merge branch 'master' of github.com:ralsina/nikola

Conflicts:
	docs/manual.txt
merged master