Code

Merge remote branch 'trenkel/master'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 8 Dec 2009 18:58:59 +0000 (19:58 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 8 Dec 2009 18:58:59 +0000 (19:58 +0100)
commitd664ba8f034f1f57a01d1547f27238876e43bcc1
treef5ca937795e05fb549a2f36701d67fb6c459cee4
parent706cc847954b52da039d86f2655874c83a3d3140
parent8f1c887520a70b6334e50f27e7417769505d0024
Merge remote branch 'trenkel/master'