Merge branch 'ics'
commit952a45bc3ded06c6e16325a85523607b7cce9ea4
authorPaolo Capriotti <p.capriotti@gmail.com>
Sat, 28 Jul 2007 17:51:45 +0000 (28 19:51 +0200)
committerPaolo Capriotti <p.capriotti@gmail.com>
Sat, 28 Jul 2007 17:51:45 +0000 (28 19:51 +0200)
treecb027310f02d5f625bc977ffd4014d8d70892e62
parent40c7c80cacad26e3f22c8d7629c28b29504a6829
parenta5455be5c3c075c36c1acc7f8b32624606e7cb93
Merge branch 'ics'