Commit ee97526b8c66a7b5587693a8948017a6cceb66fd

Anon Ray
Thu Jun 27 19:45:15 IST 2013

Tree SHA1: ad825ac
Parent SHA1: 85f04b7 (Merge branch 'master' of git://git.pantoto.org/sweet-web/sweet-web-engine)
Parent SHA1: a9e66de (Template changes)

Merge branch 'master' of git://git.pantoto.org/sweet-web/sweet-web-engine

Resolve Conflicts:
	templates/show_entries.html