tree 1fadb398b67891a5ea159c3eb4ab4b3009bb31c4
parent a39c689f96208922930738924e0bcee78c311cbb
parent 1cc3fa81020bd4914eeb59905ba47c2aa2788e19
author Harald Welte <laforge@gnumonks.org> 1246460259 +0200
committer Harald Welte <laforge@gnumonks.org> 1246460259 +0200

Merge branch 'master' into sms