Merge branch 'master' of mjesec.ffzg.hr:/git/librfid
authorDobrica Pavlinusic <dpavlin@debian7.(none)>
Sun, 19 Jan 2014 13:24:45 +0000 (08:24 -0500)
committerDobrica Pavlinusic <dpavlin@debian7.(none)>
Sun, 19 Jan 2014 13:24:45 +0000 (08:24 -0500)

Trivial merge