David Beitey 41d3a1e8dd Merge branch 'github-social-icon' into improved-icons ... Conflicts: docs/changelog.rst		2012-11-04 12:09:28 +10:00
..
icons	Merge branch 'github-social-icon' into improved-icons	2012-11-04 12:09:28 +10:00