Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorTorste Aikio <zokier@zokier.laptop>
Tue, 1 Jun 2010 12:16:01 +0000 (15:16 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Tue, 1 Jun 2010 12:16:01 +0000 (15:16 +0300)
commit8edbcd05b5407018f9989d9dff3a9fa3c4b42acb
treefaeda3228590e416c0f0f6b40127a80ef2fae6e9
parenta756ab15d44f1affe020853c4f800ad74fda0599
parent1c5a7fbfa2e30f8c07221dba4fc192641af65c98
Merge branch 'master' of mercury.wipsl.com:/var/git/irwi