Merge branch 'master' of github.com:dpavlin/Printer-Zebra
authorDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 2 Nov 2012 11:12:17 +0000 (12:12 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 2 Nov 2012 11:12:17 +0000 (12:12 +0100)

Trivial merge