Merge branch 'master' of ssh://mercury/var/git/irwi
authorJari Jarvi <t7jaja00@students.oamk.fi>
Thu, 1 Jul 2010 12:53:10 +0000 (15:53 +0300)
committerJari Jarvi <t7jaja00@students.oamk.fi>
Thu, 1 Jul 2010 12:53:10 +0000 (15:53 +0300)
commit850c87190ec829b652e093039f27398dda9e25f2
tree574c4c5d2ab7bddd28330d1f685bcbb90f42dfc7
parentd69b0b622c4841e0f80799f1d590610a6bd6b2b5
parent6bbe6fd126ad0671f58f9e175b3797e949e348fd
Merge branch 'master' of ssh://mercury/var/git/irwi