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)
commitf5c44679ee61ece522527e7c614338ce37408759
tree499e5b10f592d4895b924439c06081e8e446e36c
parent9417dd88ec6cd188b2287f8f9d20e5b4c20d693a
parenteb254d8cbdfd814e7900f2969025a60491c3599a
Merge branch 'master' of github.com:dpavlin/MojoFacets

Conflicts:
bin/debian-install.sh
public/code/pool.label.pl