Merge branch 'master' of github.com:dpavlin/Printer-Zebra
authorDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 3 Feb 2012 19:56:09 +0000 (20:56 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 3 Feb 2012 19:56:09 +0000 (20:56 +0100)

Trivial merge