]> git.sesse.net Git - nms/commit
Merge from Kjetil.
authorSteinar H. Gunderson <sesse@samfundet.no>
Tue, 11 Apr 2006 10:33:00 +0000 (10:33 +0000)
committerSteinar H. Gunderson <sesse@samfundet.no>
Tue, 11 Apr 2006 10:33:00 +0000 (10:33 +0000)
commitc280fe56c85c7dbbdbdbff4dfa90b73631fe5510
tree2bdf327c8b16107bca2c6932f69f05e65f73f69b
parenta5d02b96a64d0daba91aa4f3b8f41939ba52e5f6
Merge from Kjetil.

Patches applied:

 * korbekk@start.no--2005-lap-tla/nms--kjetil--1.0--base-0
   tag of sgunderson@bigfoot.com--2006/nms--mainline--1.0--patch-69

 * korbekk@start.no--2005-lap-tla/nms--kjetil--1.0--patch-1
   removed hardcoded switch id and time from the new showswitch.pl
web/ext/showswitch.pl