Merge commit 'immerda/master' into development
authorMarcel Haerry <haerry@puzzle.ch>
Tue, 13 May 2008 10:09:59 +0000 (12:09 +0200)
committerMarcel Haerry <haerry@puzzle.ch>
Tue, 13 May 2008 10:09:59 +0000 (12:09 +0200)
commit673aa3cb3860aee50b80bda98156a3d6bf8e49d9
tree2123f795deab3e7c5b093ad646112a6e4b4883d6
parent876a2769f2c48979202ed03bbb7baeb0ebde14e1
parent0449faea92a65380646c5591ee0509fcdc67ab0b
Merge commit 'immerda/master' into development