Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorTorste Aikio <zokier@zokier.laptop>
Thu, 3 Jun 2010 09:15:26 +0000 (12:15 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Thu, 3 Jun 2010 09:15:26 +0000 (12:15 +0300)
commit7f3d5a4f14db58ea404daa5b041f83bb2ff53282
tree63db2fcdd7a5661fc5fd41e1fd155e9b7ccb9e47
parent40d3fc2ed99b9999142b516931dc3a4af4169c35
parent154bf0c00249321e2cdfb741c7f7814216388a64
Merge branch 'master' of mercury.wipsl.com:/var/git/irwi