tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent 66d620da007af27f47bf996f71988f71e2056cce
author Harald Welte (local) <laflocal@hanuman.gnumonks.org> 1250278721 +0200
committer Harald Welte (local) <laflocal@hanuman.gnumonks.org> 1250278721 +0200

Merge commit 'har/stefan'