ipri2013/tld — pull request #5 by TimSmole (2013-04-11 15:05:51+00:00)
Title: Popravljena slika uporabnika

Conflicts:
database.db
main/models.py
main/templates/main/home.html
main/templates/main/profile.html
main/views.py