merged term combo fixes into trunk
authorn.hoffmann <n.hoffmann@localhost>
Tue, 31 Jan 2012 16:56:43 +0000 (16:56 +0000)
committern.hoffmann <n.hoffmann@localhost>
Tue, 31 Jan 2012 16:56:43 +0000 (16:56 +0000)
commit0f1b38deca8fcbad4e84d08a4a3b22aa9a4406fa
treefb160c3c90c049d6bedd8ce9de69dfb74be021b1
parent7de797a747e11f1fb2885fb58fe6bff494175070
parent401480cfdae6447762b06156f7dfa5f004e80bff
merged term combo fixes into trunk