Merge remote-tracking branch 'mjesec/rfid-vm'
authorDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 28 Aug 2014 14:26:38 +0000 (16:26 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 28 Aug 2014 14:26:38 +0000 (16:26 +0200)
commit431ef752883869816f880f431349bdab07728bc0
tree66049994326bce85f6f62f6b738a0fbe07563c15
parent6e05ae959886d96cf7d05b818928102379ff3651
parent81bc11268d0a6bc9020515374ef89288fd7c07ee
Merge remote-tracking branch 'mjesec/rfid-vm'

Conflicts:
lib/Biblio/RFID/Reader.pm
lib/Biblio/RFID/Reader.pm
scripts/RFID-JSONP-server.pl