projects / Printer-Zebra.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 50d3781 9a1aee1)
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)
Conflicts:
etc/apache2/sites-available/printer-zebra


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.