Commit 2a23b90de38a9e4e069cba11380d74a72685d945

Anon Ray
Mon Feb 25 16:30:38 IST 2013

Tree SHA1: 31f673f
Parent SHA1: 725eae2 (Format bug tracker url in markdown)
Parent SHA1: 5292fee (Merging code for differentiating content based on tags)

Merge branch 'master' of github.com:janastu/mouchak

Resolve Conflicts:
	Deleted js/main.js