tree e5575789a35674ee676ece472b75394d2e283f76
parent 68b7df2f913ffd0ac261f0831df914de9a4f478c
parent 7f816aae3cb536bba065eb9dc2d95a574d067eeb
author Harald Welte <laforge@gnumonks.org> 1249740297 +0200
committer Harald Welte <laforge@gnumonks.org> 1249740297 +0200

Merge branch 'master' into sms