tree 2476b8f381420b47d03707e6553224822d6d4584
parent 778c4b956d61a1701cbe5c23f63a510a7d38dc71
parent 0a44338acf0c79e71aec15290a48e37ca8667929
author Harald Welte <laforge@gnumonks.org> 1274823777 +0200
committer Harald Welte <laforge@gnumonks.org> 1274823777 +0200

Merge commit '237f6241f2b91a81b928ce4e3fc1364f61f11eaa'