Merge git://repo.or.cz/oscopy/ivan into ui
commitc758491ccf0574610c95dd5c01c6d12749404497
authorArnaud Gardelein <agard@nostalgia-for-infinity.(none)>
Tue, 22 Sep 2009 20:56:40 +0000 (22 22:56 +0200)
committerArnaud Gardelein <agard@nostalgia-for-infinity.(none)>
Tue, 22 Sep 2009 20:56:40 +0000 (22 22:56 +0200)
tree774b1e4191c80beab1793575f10f0e014f5ebaa1
parent94c377ab76ff45717912a66d8c17dc4b2035f436
parentb174affca2ec635b635584f9d83bb62462314596
Merge git://repo.or.cz/oscopy/ivan into ui