Merge branch 'master' of git.ganneff.de:conkeror master
authorJoerg Jaspert <joerg.jaspert@dlh.de>
Mon, 26 Jan 2015 13:41:57 +0000 (14:41 +0100)
committerJoerg Jaspert <joerg.jaspert@dlh.de>
Mon, 26 Jan 2015 13:41:57 +0000 (14:41 +0100)
* 'master' of git.ganneff.de:conkeror:
  changes
  make it work with newest firefox

Conflicts:
.conkerorrc/025-contentPolicy.js


Trivial merge