Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorTorste Aikio <zokier@zokier.laptop>
Tue, 6 Jul 2010 12:10:22 +0000 (15:10 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Tue, 6 Jul 2010 12:10:22 +0000 (15:10 +0300)
commit25589f8d9af69b7be64a606236f180f005dfd739
tree73525a608fccc9cd31eb464ffb4ff1a996908f4e
parent8fdb5505afc67545658908bc0305a5ff7f695a3a
parent4ef0d8c37c20f3183fea2c2babcc7d5503ba18e9
Merge branch 'master' of mercury.wipsl.com:/var/git/irwi