aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJez Ng2013-03-06 04:25:23 -0500
committerJez Ng2013-03-06 04:25:23 -0500
commit25c871c9bfc15278d72b9d0b2821b92627a605c6 (patch)
tree7936f3212a76b6ef72f5feada6144f2e19b01465 /lib
parent4c5fcc544f016c0f06dfa548bd46bd4f6e46eeda (diff)
parent22093e34ab94bbdab4059f197a67f8b57dd0b99e (diff)
downloadvimium-25c871c9bfc15278d72b9d0b2821b92627a605c6.tar.bz2
Merge remote-tracking branch 'deiga/patch-4'
Conflicts: background_scripts/commands.coffee
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions