tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent 6da4e86b2c1a98e292b2aea5ff2a9a91b570c9a2
parent 1639d72d32b1f724963f307145509a49e87bc51d
author Harald Welte <laforge@gnumonks.org> 1249597983 +0200
committer Harald Welte <laforge@gnumonks.org> 1249597983 +0200

Merge branch 'master' into sms