Merge branch 'master' of github.com:dpavlin/Printer-Zebra
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 17 Jun 2012 15:18:30 +0000 (17:18 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 17 Jun 2012 15:18:52 +0000 (17:18 +0200)
commit2aec78145015f59aaef6fd7a690c328e8d258967
treeb4e5daf8924e4713684154a856c618eba8bb950d
parent8c2b26253acfa7ab9c4b1cf88916a227baad5510
parent7059e347a923873dd77b5c1a46b7c020042358be
Merge branch 'master' of github.com:dpavlin/Printer-Zebra

Conflicts:
bin/debian-install.sh
bin/debian-install.sh