Merge branch 'master' of git.ganneff.de:conkeror master
drwxr-xr-x - .conkerorrc