Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorTorste Aikio <zokier@zokier.laptop>
Wed, 2 Jun 2010 10:20:02 +0000 (13:20 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Wed, 2 Jun 2010 10:20:02 +0000 (13:20 +0300)
commitc3ad8257b878355efacc80b5161a48a3cd54a563
tree58c2414c319b077d8e5d9f51728f70fb921415b0
parentfa4310af7b71d49e7cc06f67e7a33aedd5a57dc5
parent1a0696a0ca985e9d7107538fcf57296a251b02c2
Merge branch 'master' of mercury.wipsl.com:/var/git/irwi