Merge branch 'master' of mjesec.ffzg.hr:/git/Biblio-RFID
authorDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 29 Oct 2014 13:33:21 +0000 (14:33 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 29 Oct 2014 13:33:21 +0000 (14:33 +0100)
Conflicts:
examples/selfcheck.js


Trivial merge