old-packaging-merge

Tomasz Buchert

@tomasz

f90b69fe · Merge branch 'old-packaging' · Sep 03, 2015

This merges old work on packaging with new pristine import.