tree 2fac2d574aabb9de5003da71d35fc110e4b2ee38
parent 596fed40f0f1d986b94d1297bea7e25514e7264f
parent f8d536def97a65f5a0f1dec7f38ee15030acae53
author Harald Welte <laforge@gnumonks.org> 1248368941 +0200
committer Harald Welte <laforge@gnumonks.org> 1248368941 +0200

Merge branch 'master' into sms