Merge branch 'pr/571' (closes #571)

Conflicts:
	docs/changelog.rst

docs/changelog.rst

@@ -8,6 +8,9 @@ Release history
 * Ensure WordPress import adds paragraphs in for all types of line endings
   in post content.
 * Decode HTML entities within WordPress post titles on import
+* Improved appearance of LinkedIn icon in default theme
+* Add GitHub and Google+ social icons support in default theme
+* Optimize social icons
 
 3.0 (2012-08-08)
 ==================

pelican/themes/notmyidea/static/css/main.css

@@ -309,7 +309,10 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
 		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
-        .social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
+		.social a[href*='github.com'],
+		.social a[href*='git.io'] {background-image: url('../images/icons/github.png');}
+		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
+		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
 
 /*
 	About