Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorJoonas Partanen <t7pajo01@students.oamk.fi>
Tue, 8 Jun 2010 08:05:50 +0000 (11:05 +0300)
committerJoonas Partanen <t7pajo01@students.oamk.fi>
Tue, 8 Jun 2010 08:05:50 +0000 (11:05 +0300)
commit620e17833aa80a757f419f9cc372995a0d309c24
treeb91695128a02ab21ea05370a25e0308da49103d2
parent9b214503c32522656e3f08d480dd1d4387a4375a
parent0eaa494cc0455ec135e4d536a8ca96b6af1688f9
Merge branch 'master' of mercury.wipsl.com:/var/git/irwi