tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent 01307ec2560a7c54823e5e96ce9e1c8fcbaf0bec
parent 9a16e22e9b47084a350a0f4593ddbf404bf2c18e
author Harald Welte <laforge@gnumonks.org> 1246692107 +0200
committer Harald Welte <laforge@gnumonks.org> 1246692107 +0200

Merge branch 'master' into sms