haproxy-dev: fix typo in the SMF manifest
Fixing safetyfirst bash functions
Adding vmadm delete to HISTIGNORE
Adding nolazyload to vsftpd
Bump PHP 5.3 to 5.3.24
Bump PHP 5.3 to 5.3.24 - sample manifest
Bump PHP 5.4 to 5.4.14
Merge branch 'master' of git.everycity.co.uk:ec-userland
Merge branch 'master' of git.everycity.co.uk:ec-userland
php53: disable use of mmap() on PHP code files
Fixing -R path for libz
Bump zlib to 1.2.8
Bump node.js to 0.10.5
Bump FFmpeg to 1.2
Merge branch 'master' of git.everycity.co.uk:ec-userland
Adding lftp
Adding watch
Adding s10 support to watch
Backout unnecessary LDFLAGS in zlib
Fix cassandra download