Merge branch 'master' of github.com:dpavlin/Printer-Zebra
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 17 Jun 2012 15:47:36 +0000 (17:47 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 17 Jun 2012 15:47:36 +0000 (17:47 +0200)
commitb96ae727ffce45736bf984bb7e813c0418926ac1
treec6e1138205ed4bdf068d36f66b75d00d3bf20944
parent50d3781a7b8767f85d03c8b29872cdd05ea7be10
parent9a1aee14f6d60a0ed56675a8150e2cfc001c4ec3
Merge branch 'master' of github.com:dpavlin/Printer-Zebra

Conflicts:
etc/apache2/sites-available/printer-zebra