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)
commit80ce4b8c743857b75d95dc9a4590d49f51259dc9
treefef1367a1f84885329ac9d3a24e345a58dc9b414
parent010bacf18c51fee32dd51b14da59418ea0ee784e
parent4187388ec9739f1b844c9fcc16483e45c5888000
Merge branch 'master' of git.ganneff.de:conkeror

* 'master' of git.ganneff.de:conkeror:
  add ris
.conkerorrc/webjumps.js