tree e5575789a35674ee676ece472b75394d2e283f76
parent 76042188e09d2ea5f138474ade70e1f74f317aea
parent 757a9f8591a4fb34bc902d7f0a9235d01f91f13d
author Harald Welte <laforge@gnumonks.org> 1249740297 +0200
committer Harald Welte <laforge@gnumonks.org> 1249740297 +0200

Merge branch 'master' into sms