Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorTorste Aikio <zokier@zokier.laptop>
Tue, 25 May 2010 06:54:35 +0000 (09:54 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Tue, 25 May 2010 06:54:35 +0000 (09:54 +0300)
commit8b4a78af090fd79c618be83af199c48b63b14e3d
tree4fd5d9dd3b48df8a34640c9da776c4d90b30d953
parent6f37b82a0dc3cab9ba8f5ca1b151c48d7de73a04
parent818328b10565890813896256cf2c67ebc6393ecc
Merge branch 'master' of mercury.wipsl.com:/var/git/irwi