Merge branch 'issue-449' of github.com:ppp0/puppet-packages into issue-455
Merge branch 'master' of github.com:cargomedia/puppet-packages into issue-455
Merge branch 'master' of github.com:cargomedia/puppet-packages into issue-455
Adapt polipo's memory requirements
Restart nfs-server also if remount succeeded
Merge pull request #458 from njam/issue-458

Fix mount-check nfs hack
Merge pull request #455 from ppp0/issue-455

Make virtualbox module work with wheezy
Add missing semicolons
Add require monit
Merge pull request #461 from ppp0/issue-461

nginx: adapt to wheezy
Apply mount-check.sh hack only on "storage1" machine
Merge pull request #462 from njam/issue-462

Make mount-check.sh more specific
Merge branch 'issue-460' of github.com:kris-lab/puppet-packages into issue-460
Adapted tests to check ssl_session_cache
fixed typo in expected