Merge pull request #47 from jcollie/master

Update Wireshark to 1.11.1
fix name
fix name
`
Firefox 26 sls
Merge pull request #49 from rw4/patch-2

Firefox 26 sls
nxlog