whoops
Merge branch 'packaging' of github.com:ether/etherpad-lite into packaging