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)
commitb345c96a96beb8542377f2bbef9dde9716e51e62
tree9cc85c89c03561a9f6d92facfe06880dccda87d1
parentc04a2fffbd6f991ec27b187577464229459f2ac4
parentc6dc47f17424b2ebe679546ecdd33f4726573209
Merge branch 'master' of git.ganneff.de:conkeror

* 'master' of git.ganneff.de:conkeror:
  changes
  make it work with newest firefox

Conflicts:
.conkerorrc/025-contentPolicy.js