Merge changes in JPC-RR r10.8
commit3c34924fa9ddd76c57f095232c168de4d49b55ed
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 21 May 2010 00:44:54 +0000 (21 03:44 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 21 May 2010 00:44:54 +0000 (21 03:44 +0300)
treed486b337ff3ffe75950964a8668600dcf1f3cc31
parent0101a12f79c78b6e7c5b48b5feff8e8e8e749af1
parenta81c919fac1c8c58f922d236fd6ecc547b5bfa81
Merge changes in JPC-RR r10.8

Conflicts:
Changelog.utf8
Changelog.utf8