Merge branch 'rebase-optical-fixes' into new-features
commit3beec947b16f220742d66b3307b706962e5067fc
authorSven Strickroth <email@cs-ware.de>
Sun, 1 May 2011 05:39:19 +0000 (1 07:39 +0200)
committerSven Strickroth <email@cs-ware.de>
Sun, 1 May 2011 05:39:19 +0000 (1 07:39 +0200)
treeb46f38ea07c18e27dcf29c2d32e23c1958948759
parentd3cbc6110d69e47a6284658f10b1bd45da1cfcc4
parentac6b08b5d8f73d9a1870f7f1f206c9666b096ac0
Merge branch 'rebase-optical-fixes' into new-features