tree 79fc539c4e6a92be9961a85d1fe7eabe6dd9fac9
parent 3366a94d6c3cd28c71bf76133a3ead3212fd04f1
parent 15efcd2e276b4f93461eb1ea5436c093fc727117
author Harald Welte <laforge@gnumonks.org> 1248799245 +0200
committer Harald Welte <laforge@gnumonks.org> 1248799245 +0200

Merge branch 'master' into sms