tree ee1d623f9b85a5205a24b4f47535be005a00a586
parent 3e0f6173f15dd17977d38ea01b50893ad76ec4a3
parent 3d571839108be8ec572f638456e6887c3db53b0b
author Harald Welte <laforge@gnumonks.org> 1247176474 +0200
committer Harald Welte <laforge@gnumonks.org> 1247176474 +0200

Merge branch 'master' into sms