David Beitey 41d3a1e8dd Merge branch 'github-social-icon' into improved-icons ... Conflicts: docs/changelog.rst		2012-11-04 12:09:28 +10:00
..
notmyidea	Merge branch 'github-social-icon' into improved-icons	2012-11-04 12:09:28 +10:00
simple/templates	Apply the string formatting to {TAG,CATEGORY}_FEED urls.	2012-10-12 23:01:50 +02:00