Merge branch 'devel'
authorAndreas Unterkircher <unki@netshadow.at>
Sun, 20 Jan 2008 10:20:56 +0000 (11:20 +0100)
committerAndreas Unterkircher <unki@netshadow.at>
Sun, 20 Jan 2008 10:20:56 +0000 (11:20 +0100)
commitb1eac5f578ef049e43a62f1c8d4bbc8f3527db22
tree1f6210f3a65ef9b0b7b2d7b48ba8e85c8db935a3
parent061b005105a7da791de2a8fbb461f77f2615b6cd
parent74c290c62bbc48dfd0aa1d243a700da4eb0dcd1f
Merge branch 'devel'