tree 5d5585671fee2adfb5990a22dd39eaa4fe2564d5
parent 539bc608bde945652c90a8c7c8121fcd5ce8d68a
parent ae0f2362bb5a02ade62a02b73c4754922553d831
author Harald Welte <laforge@gnumonks.org> 1248022155 +0200
committer Harald Welte <laforge@gnumonks.org> 1248022155 +0200

Merge branch 'master' into sms