Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorTorste Aikio <zokier@zokier.laptop>
Tue, 1 Jun 2010 13:24:35 +0000 (16:24 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Tue, 1 Jun 2010 13:24:35 +0000 (16:24 +0300)
commit9189af3d3f00da789c1a41ef01d56712bd30b270
tree07f521b2a87f1cdec5e3b3c95780d7bbcb43b7f5
parent8edbcd05b5407018f9989d9dff3a9fa3c4b42acb
parent0d934128411dda42ef8faff23ffed2f63c5809b6
Merge branch 'master' of mercury.wipsl.com:/var/git/irwi