Merge branch 'master' of github.com:dpavlin/MojoFacets
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 11 Aug 2012 14:08:13 +0000 (16:08 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 11 Aug 2012 14:08:13 +0000 (16:08 +0200)
Conflicts:
bin/debian-install.sh
public/code/pool.label.pl


Trivial merge