tree 88dd24c2fd798e1dbdcbe430d77bfb634a21ab1d
parent 115d1036d6ecc52356a73a45e7eec118ce0ba510
parent ddfdef1529f58039a79b6309be5c7b54680f0811
author Harald Welte <laforge@gnumonks.org> 1249897432 +0200
committer Harald Welte <laforge@gnumonks.org> 1249897432 +0200

Merge commit 'origin/master'