Merge branch 'master' of mjesec.ffzg.hr:/git/facebook-dancer
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 14 Nov 2010 14:57:10 +0000 (15:57 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 14 Nov 2010 14:57:10 +0000 (15:57 +0100)

Trivial merge