Merge branch 'master' of mjesec.ffzg.hr:/git/MojoFacets
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 3 Apr 2011 19:55:00 +0000 (21:55 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 3 Apr 2011 19:55:00 +0000 (21:55 +0200)

Trivial merge