From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Sun, 17 Jun 2012 15:18:30 +0000 (+0200)
Subject: Merge branch 'master' of github.com:dpavlin/Printer-Zebra
X-Git-Url: http://git.rot13.org/?p=Printer-Zebra.git;a=commitdiff_plain;h=2aec78145015f59aaef6fd7a690c328e8d258967;hp=2aec78145015f59aaef6fd7a690c328e8d258967

Merge branch 'master' of github.com:dpavlin/Printer-Zebra

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