tree 77df4bba27c88e66faf6042450809b7c6cc3d6d1
parent 90055df59e007b4f2912ea44851397ce06d3c787
parent 6f5aee07e50d5dd80529b2780556eb570a340cd2
author Harald Welte <laforge@gnumonks.org> 1248377068 +0200
committer Harald Welte <laforge@gnumonks.org> 1248377068 +0200

Merge branch 'master' into sms