tree 177acedc855f37ac7e560dd0bb38d6f764d8a0a3
parent 2f33d01aaf24154c4f690c088b78b02b6135c206
parent 9e527ce662d347ef737d4ed283200d42a37879c5
author Harald Welte <laforge@gnumonks.org> 1248808334 +0200
committer Harald Welte <laforge@gnumonks.org> 1248808334 +0200

Merge commit 'origin/master' into sms