Merge branch 'master' of git.ganneff.de:conkeror
authorJoerg Jaspert <joerg@debian.org>
Fri, 10 May 2013 19:00:25 +0000 (21:00 +0200)
committerJoerg Jaspert <joerg@debian.org>
Fri, 10 May 2013 19:00:25 +0000 (21:00 +0200)
* 'master' of git.ganneff.de:conkeror:
  add ris

1  2 
.conkerorrc/webjumps.js

Simple merge