Merge branch 'master' of mjesec.ffzg.hr:/git/vrDialog
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 13 Dec 2014 18:20:48 +0000 (19:20 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 13 Dec 2014 18:20:48 +0000 (19:20 +0100)

Trivial merge