Merge branch 'experimental' of ssh://agardelein@repo.or.cz/srv/git/oscopy into exp2
commit3f294b1bf03badff00bba10e903fff24570cd17c
authorArnaud Gardelein <agard@nostalgia-for-infinity.(none)>
Sun, 7 Jun 2009 19:17:46 +0000 (7 21:17 +0200)
committerArnaud Gardelein <agard@nostalgia-for-infinity.(none)>
Sun, 7 Jun 2009 19:17:46 +0000 (7 21:17 +0200)
treee382a775e6522ee11e9f909276ec4e00665d46cc
parentd21325a3995dcf03fcee539634fff5a90da1fc03
parent2318084925898654a9939e1f1a670f981bb86741
Merge branch 'experimental' of ssh://agardelein@repo.or.cz/srv/git/oscopy into exp2