Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorTorste Aikio <zokier@zokier.laptop>
Fri, 4 Jun 2010 07:15:43 +0000 (10:15 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Fri, 4 Jun 2010 07:15:43 +0000 (10:15 +0300)
commit5a8dedf320e1c5f9e1668b1c3e6aea48031927a8
tree6e377500ff7de75ba4395ee0357a589ad8352056
parentf091b50bc6e03c3045c86ba879baf84f3f0955a1
parent6179e93c966c4a19f18bd714eafd45702effcfff
Merge branch 'master' of mercury.wipsl.com:/var/git/irwi