Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorTorste Aikio <zokier@zokier.laptop>
Fri, 4 Jun 2010 09:29:41 +0000 (12:29 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Fri, 4 Jun 2010 09:29:41 +0000 (12:29 +0300)
commitb3115ba10c02c133a5903bc650e187e58feb0d83
tree0a1094f5b482163ac513ddbc7c6105bdbebd376c
parent9de4c5ba982faad3a92e6fcbb9a105d0020996a6
parent55dfb29b509cbbcb9673ab377040498b94ead892
Merge branch 'master' of mercury.wipsl.com:/var/git/irwi